Revert "Trimmed the branch to only the map_server sub directory"

This reverts commit d9f1db4a3871fae7e6245999477cc0b6a15c3a8e.
Rebase from 'upstream'
Trimmed the branch to only the map_server sub directory