PLA-1607 Handle demo-hosts properly
Merge pull request #3942 from Wikia/PLA-1607

PLA-1607 Handle demo-hosts properly