[ros-diffs] [ion] 15642: more build fixes