Merge branch '16809-s3-v4-signature'

closes #16809

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

diff --cc lib/install/deps.go
index 4378023158a085d0500b2d88164d0babc21671e7,b16d5bfc272b3ba3d3ddcfb8ad817e89ba316f9d..15ff0607a9a927e9659ac581d786e393b51f6c44
--- 1/lib/install/deps.go
--- 2/lib/install/deps.go
+++ b/lib/install/deps.go
@@@ -142,16 -142,11 +142,16 @@@ func (installCommand) RunCommand(prog s
                        "postgresql",
                        "postgresql-contrib",
                        "python3-dev",
+                       "python3-venv",
+                       "python3-virtualenv",
                        "r-base",
                        "r-cran-testthat",
 +                      "r-cran-devtools",
 +                      "r-cran-knitr",
 +                      "r-cran-markdown",
 +                      "r-cran-roxygen2",
 +                      "r-cran-xml",
                        "sudo",
-                       "python3-virtualenv",
-                       "python3-venv",
                        "wget",
                        "xvfb",
                        "zlib1g-dev",

diff --cc services/keep-web/s3.go
Simple merge

diff --cc services/keep-web/s3_test.go
Simple merge