15954: Merge branch 'master'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

diff --cc build/run-tests.sh
Simple merge

diff --cc go.mod
index 85e5552f63f41d48886977e8fed9f6efc13d79f0,2f1852734099cb2238c4ba6a70baa477fad3b3a8..6d5f748d42f22ccbfcfa41c4a4237fe826a9baab
--- 1/go.mod
--- 2/go.mod
+++ b/go.mod
@@@ -30,8 -31,9 +31,9 @@@ require 
        github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
        github.com/jmcvetta/randutil v0.0.0-20150817122601-2bb1b664bcff
        github.com/julienschmidt/httprouter v1.2.0
+       github.com/karalabe/xgo v0.0.0-20191115072854-c5ccff8648a7 // indirect
        github.com/kevinburke/ssh_config v0.0.0-20171013211458-802051befeb5 // indirect
 -      github.com/lib/pq v0.0.0-20171126050459-83612a56d3dd
 +      github.com/lib/pq v1.3.0
        github.com/marstr/guid v1.1.1-0.20170427235115-8bdf7d1a087c // indirect
        github.com/mitchellh/go-homedir v0.0.0-20161203194507-b8bc1bf76747 // indirect
        github.com/opencontainers/go-digest v1.0.0-rc1 // indirect

diff --cc go.sum
Simple merge