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