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

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