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

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