[ros-diffs] [pschweitzer] 34387: - Fixed build - Added a diff with GreatLord changes