Bring revisions #25823 - #25824 from revise_chunks to revise_cksum_retry.
h5committested.
(Log message for previous checkin #25843 should be: "from revise_chunks to revise_chksum_retry".)