test_upload: fix test_aborted_shares
Merge remote-tracking branch 'warner/1382-rewrite-2' into 1382-rewrite-2
Updates test_query_counting