Merge branch 'master' into 15577-ownership-transfer

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --cc doc/_config.yml
index d034604f954b63815046cf32d4e718f13a5ec553,404d2f6c63a90606ea9b8099cd329da2e764ecd1..76c967ac402cc092317af29ee84813fca98132b7
--- 1/doc/_config.yml
--- 2/doc/_config.yml
+++ b/doc/_config.yml
@@@ -179,8 -175,10 +179,9 @@@ navbar
        - admin/controlling-container-reuse.html.textile.liquid
        - admin/logs-table-management.html.textile.liquid
      - Other:
 -      - admin/troubleshooting.html.textile.liquid
        - install/migrate-docker19.html.textile.liquid
        - admin/upgrade-crunch2.html.textile.liquid
+       - admin/workbench2-vocabulary.html.textile.liquid
    installguide:
      - Overview:
        - install/index.html.textile.liquid

diff --cc lib/config/config.default.yml
index d9dc664686c4e96f14292e513eaf14cbfd0f2650,81c36b9bfbe2b00626403cfde5cbdfd2894c34f9..6dcf2dbf3218a0b480639b9c5117fa9a33650988
--- 1/lib/config/config.default.yml
--- 2/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@@ -509,9 -511,15 +511,15 @@@ Clusters
        GoogleClientID: ""
        GoogleClientSecret: ""
  
+       # Allow users to log in to existing accounts using any verified
+       # email address listed by their Google account. If true, the
+       # Google People API must be enabled in order for Google login to
+       # work. If false, only the primary email address will be used.
+       GoogleAlternateEmailAddresses: true
+ 
        # The cluster ID to delegate the user database.  When set,
        # logins on this cluster will be redirected to the login cluster
 -      # (login cluster must appear in RemoteHosts with Proxy: true)
 +      # (login cluster must appear in RemoteClusters with Proxy: true)
        LoginCluster: ""
  
        # How long a cached token belonging to a remote cluster will