Description:
    Bring change from trunk to 1.8 branch:

r25450:
    Initial tweaks to align with VOL branch.

Tested on:
    Mac OSX/64 10.9.3 (amazon) w/gcc 4.9
    (h5committest not required, too small)