Merge proposals dependent on lp:~adeuring/launchpad/bug-460935-hwdb-better-consistency-check-udev-usb-devices

1. bug-460935-hwdb-better-consistency-check-udev-usb-devices
2. Dependent merge proposals