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

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