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

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