[ros-diffs] [cgutman] 43509: - Define GUIDs correctly to prevent "multiple definition" errors