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

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