Merge proposals dependent on lp:~brendan-donegan/qakit/upload_improvements_fixes

lp:~brendan-donegan/qakit/upload_improvements_fixes has no merge proposals.