[ros-diffs] [aandrejevic] 62850: Fix broken merge.