USB fixes from Petteri Aimonen, cherry-picked.
Merge pull request #210 from PX4/usb_fixes

USB fixes from Petteri Aimonen, cherry-picked.