Merge branch 'master' into 5493-getting-started-modal

diff --cc apps/workbench/app/views/layouts/body.html.erb
Simple merge

diff --cc apps/workbench/test/integration/application_layout_test.rb
Simple merge

diff --cc services/api/test/fixtures/api_client_authorizations.yml
Simple merge

diff --cc services/api/test/fixtures/users.yml
Simple merge

diff --cc services/api/test/functional/arvados/v1/users_controller_test.rb
Simple merge