[ros-diffs] [gedmurphy] 30397: fix RosBE build