Merge branch 'master' into 14360-dispatch-cloud

refs #14360

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

diff --cc lib/dispatchcloud/node_size.go
index e77c862b3668146d244f20b70b268a38a9dd9640,339e042c1aa0d15cb3f6cf1994c6146bf34de11d..2fac799f40e30ae99e0b496cbe7e1e343d759a4b
--- 1/lib/dispatchcloud/node_size.go
--- 2/lib/dispatchcloud/node_size.go
+++ b/lib/dispatchcloud/node_size.go
@@@ -6,7 -6,13 +6,10 @@@ package dispatchclou
  
  import (
        "errors"
 -      "os/exec"
+       "log"
+       "regexp"
        "sort"
 -      "strings"
 -      "time"
+       "strconv"
  
        "git.curoverse.com/arvados.git/sdk/go/arvados"
  )

diff --cc services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
Simple merge

diff --cc services/crunch-run/crunchrun.go
Simple merge