[ros-diffs] [tkreuzer] 50657: merge most spec file changes from cmake branch