hdf5_der

[svn-r28641] Description:
    Minor code cleanups during review/review/merge of branch

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