Update to hydro changes on warehouse_ros and map_server