[ros-diffs] [cwittich] 46395: [CMBATT] fix build