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

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