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

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