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

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