16212: Merge branch 'master'

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

diff --combined build/run-tests.sh
index 106793f7a62334b27c85102889831237b25f49eb,7a3302de9bc98e968845ae6a42b83d3a51c0d663..72a7620ba7a0fab018f1785adc7464538db7c87a
--- 1/build/run-tests.sh
--- 2/build/run-tests.sh
+++ b/build/run-tests.sh
@@@ -127,7 -127,7 +127,7 @@@ sdk/go/blockdiges
  sdk/go/asyncbuf
  sdk/go/stats
  sdk/go/crunchrunner
- sdk/cwl
+ sdk/cwl:py3
  sdk/R
  sdk/java-v2
  tools/sync-groups
@@@ -262,9 -262,6 +262,9 @@@ sanity_checks() 
      echo -n 'libpq libpq-fe.h: '
      find /usr/include -path '*/postgresql/libpq-fe.h' | egrep --max-count=1 . \
          || fatal "No libpq libpq-fe.h. Try: apt-get install libpq-dev"
 +    echo -n 'libpam pam_appl.h: '
 +    find /usr/include -path '*/security/pam_appl.h' | egrep --max-count=1 . \
 +        || fatal "No libpam pam_appl.h. Try: apt-get install libpam-dev"
      echo -n 'postgresql: '
      psql --version || fatal "No postgresql. Try: apt-get install postgresql postgresql-client-common"
      echo -n 'phantomjs: '
@@@ -998,7 -995,6 +998,6 @@@ pythonstuff=
      sdk/pam
      sdk/python
      sdk/python:py3
-     sdk/cwl
      sdk/cwl:py3
      services/dockercleaner:py3
      services/fuse
@@@ -1276,7 -1272,8 +1275,8 @@@ els
                          ${verb}_${target}
                          ;;
                      *)
-                         testargs["$target"]="${opts}"
+                       argstarget=${target%:py3}
+                         testargs["$argstarget"]="${opts}"
                          tt="${testfuncargs[${target}]}"
                          tt="${tt:-$target}"
                          do_$verb $tt