More catkinization of layered costmap changes