Bring revisions 16636:16821 from trunk to revise_chunks branch Tested on: FreeBSD/32 6.3 (duty) Mac OS X/32 10.5.6 (amazon) (h5committest not needed on this branch)
Bring r16347:16367 from trunk into revise_chunks branch. Tested on: FreeBSD/32 6.3 (duty) (h5committest not required on this branch)