Ported WikiaLabs changes from dev branch and added P2s fixes

Merge pull request #4210 from Wikia/CE-934
(CE-934) Add Maps to WikiFeatures

Added P2s fixes.