3550: Merge branch 'master' into 3550-local-pipeline

Conflicts:
	sdk/cli/bin/arv-run-pipeline-instance

diff --cc sdk/cli/bin/arv-run-pipeline-instance
index dee57b059ebdd231d77775025644d59940fa611c,05fce2c9da36d0aae52cb178131d96a0befd4a81..472c20bd73a283feb3149c44b6b3f534d3ed50bb
--- 1/sdk/cli/bin/arv-run-pipeline-instance
--- 2/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@@ -163,9 -174,13 +165,13 @@@ p = Trollop::Parser.new d
        :short => :none,
        :type => :boolean)
    opt(:run_here,
 -      "Manage the pipeline in process.",
 +      "Synonym for --run-jobs-here.",
        :short => :none,
        :type => :boolean)
+   opt(:description,
+       "Description for the pipeline instance.",
+       :short => :none,
+       :type => :string)
    stop_on [:'--']
  end
  $options = Trollop::with_standard_exception_handling p do