[ros-diffs] [tfaber] 71280: [0.4.1] - Merge Mark's UniATA compilation fix from r71262 CORE-11157