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

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