[ros-diffs] [spetreolle] 50504: [CMAKE] Sync trunk up to r50477.