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

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