MAIN-3274 CORS Allow-Origin | Fix refactoring errors
Merge pull request #5585 from Wikia/MAIN-3274

MAIN-3274 CORS Allow-Origin | Fix refactoring errors | Merge to preview