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

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