Ported changes from dev as fix for P2: MOB-1744

Merge pull request #4239 from Wikia/MOB-1744
MOB-1744: Restore map
Ported i18n changes from dev as a P2 fix: MOB-2272

Merge pull request #4257 from Wikia/MOB-2272
MOB-2272
Merge pull request #4261 from Wikia/maps-p2-fixes

Maps P2s fixes