15003: Merge branch 'master'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --cc lib/config/config.default.yml
Simple merge

diff --cc lib/config/generated_config.go
Simple merge

diff --cc lib/config/load_test.go
Simple merge

diff --cc lib/service/cmd.go
index cfc40778fefe43d565bb0658b626e899edfc1f09,955b21f9ea0ef1ac21bc069f67079a767aabac1e..fdcf3b4ac5670992bf94c1d11e886fab5605e84d
--- 1/lib/service/cmd.go
--- 2/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@@ -10,8 -10,7 +10,9 @@@ import 
        "flag"
        "fmt"
        "io"
+       "io/ioutil"
 +      "log"
 +      "net"
        "net/http"
        "net/url"
        "os"

diff --cc sdk/python/tests/run_test_server.py
Simple merge