Merge branch 'master' into 3699-arv-copy

diff --cc sdk/cli/bin/arv
index ec3d8061b52a82f98b5dfe9163b4a74c20030b35,481cd9ee6014593bb3185e043fda99ce3ab557c2..3489f8e4334b87dc53bb5d61e7a30851d54f08d6
--- 1/sdk/cli/bin/arv
--- 2/sdk/cli/bin/arv
+++ b/sdk/cli/bin/arv
@@@ -116,9 -117,13 +117,13 @@@ subcommands = %w(create edit keep pipel
  
  def check_subcommands client, arvados, subcommand, global_opts, remaining_opts
    case subcommand
+   when 'create'
+     arv_create client, arvados, global_opts, remaining_opts
+   when 'edit'
+     arv_edit client, arvados, global_opts, remaining_opts
    when 'keep'
      @sub = remaining_opts.shift
 -    if ['get', 'put', 'ls', 'normalize'].index @sub then
 +    if ['get', 'put', 'ls', 'normalize', 'copy'].index @sub then
        # Native Arvados
        exec `which arv-#{@sub}`.strip, *remaining_opts
      elsif ['less', 'check'].index @sub then