PAHMA-964: Retry batches when they fail.
Merge branch 'ucb-deploy_3.3' into pahma_3.3