CDB-1818 changed batch size to 25k and rename retries to 5 after some real world tests (still not definitive probably)
Merge remote-tracking branch 'origin/CDB-1818' into release/2.11.1