vchoi_fork

[svn-r28915] Description:
    Review revisions on the way to the trunk.

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