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

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