[ros-diffs] [akhaldi] 52122: * Sync the recent cmake branch changes.