18700: Merge branch 'main'

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

diff --cc cmd/arvados-server/cmd.go
index c5465ee5615c3ca0a778f48603c66bb788a4b6be,13b06d6795158937d2da41557458f6bf59f384f5..26c3f485ea348bb723f04e21afd4a92816fedd47
--- 1/cmd/arvados-server/cmd.go
--- 2/cmd/arvados-server/cmd.go
+++ b/cmd/arvados-server/cmd.go
@@@ -42,9 -39,9 +43,10 @@@ var 
                "dispatch-lsf":       lsf.DispatchCommand,
                "install":            install.Command,
                "init":               install.InitCommand,
+               "keepproxy":          keepproxy.Command,
                "keepstore":          keepstore.Command,
                "recover-collection": recovercollection.Command,
 +              "workbench2":         wb2command{},
                "ws":                 ws.Command,
        })
  )

diff --cc lib/boot/supervisor.go
Simple merge

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

diff --cc lib/controller/integration_test.go
Simple merge