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

This reverts commit 20ab03dcba5700d91d388560139116530e26da15.
Rebase from 'upstream'
Trimmed the branch to only the jsk_ros_patch/multi_map_server sub directory