[ros-diffs] [sginsberg] 35089: - ...fix ros.diff