12876: Merge branch 'master' into 12876-arvados-client

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

diff --cc build/run-build-packages-one-target.sh
index 2af01e3134d4797d6c601ad603e8449e90fd045d,983c221f3b3b74f7235b04057cb3bd1bee1f9dba..c981b2a9ef679509bb24f7ecd25d005fb9d50920
--- 1/build/run-build-packages-one-target.sh
--- 2/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@@ -161,7 -161,7 +161,8 @@@ pop
  
  if test -z "$packages" ; then
      packages="arvados-api-server
 +        arvados-client
+         arvados-docker-cleaner
          arvados-git-httpd
          arvados-node-manager
          arvados-src

diff --cc build/run-tests.sh
Simple merge