Merge branch 'master' into 2756-eventbus-in-workbench

Conflicts:
	apps/workbench/app/views/layouts/application.html.erb

diff --cc apps/workbench/app/views/layouts/application.html.erb
index f009ffe12cc4b5119a187b2f8c67f1870825e07b,a5460c295f7d0ac550f931e92034fec5dfd9f2b6..b55147fa6949fbaaa886b1f0d48ee2e0e57561a6
--- 1/apps/workbench/app/views/layouts/application.html.erb
--- 2/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@@ -14,11 -14,7 +14,10 @@@
    <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
    <meta name="description" content="">
    <meta name="author" content="">
- 
 +  <% if current_user %>
 +  <meta name="arv-websocket-url" content="<%=$arvados_api_client.discovery[:websocketUrl]%>?api_token=<%=Thread.current[:arvados_api_token]%>">
 +  <% end %>
- 
+   <meta name="robots" content="NOINDEX, NOFOLLOW">
    <%= stylesheet_link_tag    "application", :media => "all" %>
    <%= javascript_include_tag "application" %>
    <%= csrf_meta_tags %>