bring 25468 from trunk.  

Aligning code with changes made in VOL branch. This will make porting
non VOL related changes from trunkto the 1.8 branch much easier.

tested h5commitest.