ADEN-1054 fix conflict
Merge pull request #3363 from Wikia/release-220-aden-1054-fix

ADEN-1054 fix conflict