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

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