CDB-2131 upped retries to 20 per request of commercial people (who upload lots of times same table)
Merge remote-tracking branch 'origin/CDB-2131' into hotfix-20140326