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

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