Split requests for assets and messages to avoid caching issues
Simplify conditions
Merge pull request #4456 from Wikia/MWEB-734

MWEB-734 Split requests for assets and messages to avoid caching issues