vchoi_fork

[svn-r30031] Description:
    Minor code cleanup to align w/revise_chunks branch.

Tested on:
    MacOSX/64 10.11.5 (amazon) w/serial, parallel & production
    (h5committest forthcoming)