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

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