[ros-diffs] [akhaldi] 51154: [CMAKE] - Sync with trunk r51050.