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

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