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

This reverts commit 34f3354f6b4596c2c46750598f61831acad3c0de.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the jsk_ros_patch/multi_map_server sub directory