[ros-diffs] [hbirr] 18542: Merging over the usb changes didn't work. I must delete and copy the changes manually. Copying r17764 of the usb driver.