MOB-2051

**DO NOT MERGE YET**

Changes in maps messages connected to [review which happened here](https://github.com/Wikia/app/pull/4111).

Once CR and QA are done we're going to merge `intmap` branch to current release branch and then to `dev`.