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

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