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

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