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

This reverts commit e994dc7715580b90e17cf04e6e7b5eeeb80a676a.
Rebase from 'upstream'
Trimmed the branch to only the jsk_ros_patch/multi_map_server sub directory