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

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