vchoi_fork

[svn-r29630] Description:
    Minor style cleanups, from revise_chunks branch

Tested on:
    MacOSX/64 10.11.4 (amazon) w/serial, parallel and production
    (too minor to require h5committest)