[ros-diffs] [hbirr] 18729: Delete some files which weren't deleted by the merge.