hdf5_der

[svn-r30100] Description:
    Minor cleanups and alignments with trunk.

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