Merge proposals dependent on lp://staging/~bladernr/checkbox/1565812-fix-pygiwarning-usb-test

1. 1565812-fix-pygiwarning-usb-test
2. Dependent merge proposals