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

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