[ros-diffs] [cfinck] 30357: Change back some wrongly changed strings