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

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