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

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