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

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