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

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