BAC-1332 porting phalanx retry changes from previous release
Merge pull request #3067 from Wikia/BAC-1332-phalanx-retries

BAC-1332 porting phalanx retry changes from previous release