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

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