[ros-diffs] [gedmurphy] 69538: [DEVMGR] Fix building with RosBE/g++