vchoi_fork

[svn-r27956] Description:
    Minor code cleanups, preparing to merge to trunk.

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