18794: Merge branch 'main'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --cc cmd/arvados-server/cmd.go
index 342446a811f228a2fffeff990056a09fe08b7704,c9a91c872160cb74c10d098c4ae2f0f9c16ce667..ae1e3fbeee2d1e2d4310bb3f221b1f14bf77b17b
--- 1/cmd/arvados-server/cmd.go
--- 2/cmd/arvados-server/cmd.go
+++ b/cmd/arvados-server/cmd.go
@@@ -21,8 -21,8 +21,9 @@@ import 
        "git.arvados.org/arvados.git/lib/install"
        "git.arvados.org/arvados.git/lib/lsf"
        "git.arvados.org/arvados.git/lib/recovercollection"
 +      "git.arvados.org/arvados.git/sdk/go/health"
        "git.arvados.org/arvados.git/services/githttpd"
+       keepbalance "git.arvados.org/arvados.git/services/keep-balance"
        keepweb "git.arvados.org/arvados.git/services/keep-web"
        "git.arvados.org/arvados.git/services/keepproxy"
        "git.arvados.org/arvados.git/services/keepstore"

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