Merge branch 'master' into 6939-package-sso-server

Conflicts:
	jenkins/run-build-packages-all-targets.sh

refs #6939

diff --cc jenkins/run-build-packages-all-targets.sh
index 3ddb4ba76c187995ee373f366b42f337c009ce31,2761f9f02708c7889a9f54cca0b26383280c6d9b..ddf87c18e483075d1f2497ada7685d71bbbee77e
--- 1/jenkins/run-build-packages-all-targets.sh
--- 2/jenkins/run-build-packages-all-targets.sh
+++ b/jenkins/run-build-packages-all-targets.sh
@@@ -4,13 -4,10 +4,15 @@@ read -rd "\000" helpmessage <<EO
  $(basename $0): Orchestrate run-build-packages.sh for every target
  
  Syntax:
 -        WORKSPACE=/path/to/arvados $(basename $0)
 +        WORKSPACE=/path/to/arvados $(basename $0) [options]
 +
- WORKSPACE=path         Path to the Arvados source tree to build packages from
++Options:
 +
 +--command
 +    Build command to execute (default: use built-in Docker image command)
  
+ WORKSPACE=path         Path to the Arvados source tree to build packages from
+ 
  EOF
  
  if ! [[ -n "$WORKSPACE" ]]; then