hdf5_der

[svn-r27727] Description:
    Merge changes from trunk into branch.
    
    NOTE: The test/cache_image regression test is failing, but John will correct
it after this change checked in.

Tested on:
    MacOSX/64 10.10.5 (amazon) w/serial & parallel
    (h5committest not required on this branch)