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

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