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

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