2872: Merge branch 'master' into 2872-folder-nav

Conflicts:
	apps/workbench/app/controllers/application_controller.rb
	apps/workbench/app/helpers/application_helper.rb
	apps/workbench/app/models/authorized_key.rb
	apps/workbench/app/models/job.rb
	apps/workbench/app/models/pipeline_instance.rb
	apps/workbench/app/models/user.rb
	apps/workbench/app/models/virtual_machine.rb

diff --cc apps/workbench/app/assets/stylesheets/application.css.scss
index 75080a0bbdf9d58a694b9216fbbb29b91b269fe8,64c50985c85e885a2059d9c7bd3c41806be4e105..8f377bee0c735c95dfdaaf4ec01d5b52b8dcf729
--- 1/apps/workbench/app/assets/stylesheets/application.css.scss
--- 2/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@@ -175,23 -171,26 +175,26 @@@ table.table-fixed-header-row tbody 
      z-index:1055;
  }
  
 -.navbar-nav.side-nav {
 -    box-shadow: inset -1px 0 #e7e7e7;
 +/* Do not leave space for left-nav */
 +div#wrapper {
 +  padding-left: 0;
  }
 -.navbar-nav.side-nav > li:first-child {
 -    margin-top: 5px; /* keep "hover" bg below top nav bottom border */
 +
 +.arv-description-as-subtitle {
 +  padding-bottom: 1em;
  }
 -.navbar-nav.side-nav > li > a {
 -    padding-top: 10px;
 -    padding-bottom: 10px;
 +.arv-description-in-table {
 +  max-height: 3.5em;
 +  overflow-x: hidden;
 +  overflow-y: hidden;
  }
 -.navbar-nav.side-nav > li.dropdown > ul.dropdown-menu > li > a {
 -    padding-top: 5px;
 -    padding-bottom: 5px;
 +.arv-description-in-table:hover {
 +  overflow-y: scroll;
  }
 -.navbar-nav.side-nav a.active,
 -.navbar-nav.side-nav a:hover,
 -.navbar-nav.side-nav a:focus {
 -    border-right: 1px solid #ffffff;
 -    background: #ffffff;
 +
 +.btn.btn-nodecorate {
 +  border: none;
  }
 -}
+ svg text {
+     font-size: 6pt;
++}

diff --cc apps/workbench/app/models/pipeline_instance.rb
Simple merge

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