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

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