Revert "Trimmed the branch to only the jsk_ros_patch/multi_map_server sub directory"

This reverts commit ba9a83534b7d62116a772e0ee8eb04ffb6f043e4.
Rebase from 'upstream'
Trimmed the branch to only the jsk_ros_patch/multi_map_server sub directory
enable depend to map_server for hydro
Revert "enable depend to map_server for hydro"

This reverts commit 072052bf8ac2adc501d689ff0926efe9d17510b2.
Revert "Trimmed the branch to only the jsk_ros_patch/multi_map_server sub directory"

This reverts commit 70640cecb383a644798a987527ffab14aec68c52.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the jsk_ros_patch/multi_map_server sub directory
enable depend to map_server for hydro