[ros-diffs] [pschweitzer] 34392: Updated usp10_ros.diff to match with r34390 changes