Merge branch 'master' into 12033-multisite-search

refs #12033

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

diff --cc apps/workbench/app/controllers/collections_controller.rb
Simple merge

diff --cc build/run-build-packages.sh
index af90eb6f2dabad701c4b211a4733aad73e1b58f5,2958d3323d9972f7cf826ef1fb0cb69c05d448eb..2cde946d494b566d1681f3c16fd851e5a9fb7fa5
--- 1/build/run-build-packages.sh
--- 2/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@@ -620,8 -620,8 +620,9 @@@ if [[ "$?" == "0" ]] ; the
        \cp config/application.yml.example config/application.yml -f
        \cp config/environments/production.rb.example config/environments/production.rb -f
        sed -i 's/secret_token: ~/secret_token: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/' config/application.yml
+       sed -i 's/keep_web_url: false/keep_web_url: exampledotcom/' config/application.yml
  
 +      RAILS_ENV=production RAILS_GROUPS=assets bundle exec rake npm:install >/dev/null
        RAILS_ENV=production RAILS_GROUPS=assets bundle exec rake assets:precompile >/dev/null
  
        # Remove generated configuration files so they don't go in the package.

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