Backporting P2 fix from release-10

Merge pull request #224 from Wikia/MWEB-1047
MWEB-1047 fixed wildcard response for tile set entry point
Backporting changes from release-10

Merge branch 'MWEB-1047' into release-10
Backporting changes form release-10

fixed unit tests after fixing P2