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

This reverts commit 011f14249fed45d1bcc2b16649b3358d81d271c9.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the map_server sub directory