Merge branch 'master' into 3112-report-bug

Conflicts:
	services/api/config/application.default.yml

diff --cc services/api/config/application.default.yml
index bd877f6e725073d147e3202b74f9686d90ff64f4,fb19dbc01467d9ac7ee40033ed61f8f10bbeb229..f836a66e17894fc795f32837a24db12ab7131586
--- 1/services/api/config/application.default.yml
--- 2/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@@ -181,6 -182,12 +183,16 @@@ common
    # email address to which mail should be sent when the user creates profile for the first time
    user_profile_notification_address: false
  
+   default_openid_prefix: https://www.google.com/accounts/o8/id
+ 
+   # Config parameters to automatically setup new users.
+   # The params auto_setup_new_users_with_* are meaningful only when auto_setup_new_users is turned on.
+   # auto_setup_name_blacklist is a list of usernames to be blacklisted for auto setup.
+   auto_setup_new_users: false
+   auto_setup_new_users_with_vm_uuid: false
+   auto_setup_new_users_with_repository: false
+   auto_setup_name_blacklist: [arvados, git, gitolite, gitolite-admin, root, syslog]
++
 +  # source_version
 +  source_version: <%= `git log -n 1 --format=%h` %>
 +  local_modified: false