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

This reverts commit 14be586d34b197c45ba0d6e5eb8bf33d8d45565f.
Rebase from 'upstream'
Trimmed the branch to only the jsk_ros_patch/multi_map_server sub directory
Revert "Trimmed the branch to only the jsk_ros_patch/multi_map_server sub directory"

This reverts commit f06f3e228f27e4e0b098d0cb1a90098a9d739845.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the jsk_ros_patch/multi_map_server sub directory