hdf5

[svn-r27707] Description:
    Misc. minor cleanups in preparation for merging "metadata rings" branch to
trunk.

Tested on:
    MacOSX/64 10.10.5 (amazon) w/serial
    (Too minor to require h5committest)