Merge branch '16053-install-deps'

refs #16053

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

diff --cc cmd/arvados-server/cmd.go
index 80d43ad848fa0925327a2abe6fa785c968b536ae,328599826f79cdf95f49965219114b9f156ec081..fcea2223da70d5a174ee74b8281ebd3d20e0b503
--- 1/cmd/arvados-server/cmd.go
--- 2/cmd/arvados-server/cmd.go
+++ b/cmd/arvados-server/cmd.go
@@@ -14,7 -14,7 +14,8 @@@ import 
        "git.arvados.org/arvados.git/lib/controller"
        "git.arvados.org/arvados.git/lib/crunchrun"
        "git.arvados.org/arvados.git/lib/dispatchcloud"
+       "git.arvados.org/arvados.git/lib/install"
 +      "git.arvados.org/arvados.git/services/ws"
  )
  
  var (
@@@ -26,12 -26,12 +27,13 @@@
                "boot":            boot.Command,
                "cloudtest":       cloudtest.Command,
                "config-check":    config.CheckCommand,
--              "config-dump":     config.DumpCommand,
                "config-defaults": config.DumpDefaultsCommand,
++              "config-dump":     config.DumpCommand,
                "controller":      controller.Command,
                "crunch-run":      crunchrun.Command,
                "dispatch-cloud":  dispatchcloud.Command,
+               "install":         install.Command,
 +              "ws":              ws.Command,
        })
  )
  

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

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