Go back to item-count based on items read (See Bug 6509). Increment rollback metric by one even for 'normal' rollback (i.e. not a retry-with-rollback scenario). Clean up use of CheckpointAlgorithm