Update remappings for the two previous commits
Merge branch 'hydro-devel' of https://github.com/robotics-in-concert/rocon_concert.git into hydro-devel