vchoi_fork

[svn-r30095] Description:
    Bring over fixes for CMake testing from the revise_chunks branch

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