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