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

BAC-1332 porting phalanx retry changes from previous release