[ros-diffs] [akhaldi] 51268: [CMAKE] * Sync to trunk r51266.