Add generic uploader tool
Merge branch 'master' into usb_test_nov8_a