progress
Merge branch 'MOB-1543' into MOB-1543-map-service-con
in progress continue
break create map logic into 3 modules
fixed whitespace
Merge pull request #3647 from Wikia/MOB-1543-map-service-con

Mob 1543 map service con
manually merged MOB-1543 and resolved conflicts