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

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