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

This reverts commit 7b48eb671645c9f75981ee591c31a84420da1a97.
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 33eb70d732995e6a98ddd95db900f131335ce42c.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the jsk_ros_patch/multi_map_server sub directory