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

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