Bring revisions #25284 - #25434 from trunk to revise_chunks.
(Revision #25283 is skipped since it was backed out later on 11/3/2015.)
h5committested.