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

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