[ros-diffs] [cwittich] 28856: fix some of the linux build issues