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

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