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

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