Hg 384

DO NOT merge just yet

This has to be deployed first:
https://github.com/Wikia/app/pull/5569

then this can be deployed

and at the end:
https://github.com/Wikia/wikia-vcl/pull/325

Should be simple and easy :)