Merge branch '3609-arv-ws' into 3609-arv-run

Conflicts:
	sdk/cli/bin/arv

diff --cc sdk/cli/bin/arv
index 59bdfae81ae59024ba174c03600703f5e92ade99,481cd9ee6014593bb3185e043fda99ce3ab557c2..6f56a089b6a82e4cacf7a4008a04b69456bb1cc5
--- 1/sdk/cli/bin/arv
--- 2/sdk/cli/bin/arv
+++ b/sdk/cli/bin/arv
@@@ -112,7 -113,7 +113,7 @@@ def init_confi
    end
  end
  
- subcommands = %w(keep pipeline run tag ws edit)
 -subcommands = %w(create edit keep pipeline tag ws)
++subcommands = %w(create edit keep pipeline run tag ws)
  
  def check_subcommands client, arvados, subcommand, global_opts, remaining_opts
    case subcommand