[ros-diffs] [janderwald] 22327: fix build prob #take one