[ros-diffs] [akhaldi] 50271: [CMAKE] - Sync with trunk head (r50270) - This also reverts r49298.