[ros-diffs] [cgutman] 53075: - Fix the stupid mess we created when making this from the cmake branch - Part 2 of 2