Merge branch 'master' into wtsi-hgi-feature/arv-view

Conflicts:
	sdk/cli/bin/arv

diff --cc doc/sdk/cli/subcommands.html.textile.liquid
Simple merge

diff --cc sdk/cli/bin/arv
index ccdd8a8c12bc077295f336be97c1f96d30cbfb3a,2bd7f4ef465d7a3427425716c11f9e3574d9f226..c626174fbe0e2001945b255709197cc233b61951
--- 1/sdk/cli/bin/arv
--- 2/sdk/cli/bin/arv
+++ b/sdk/cli/bin/arv
@@@ -109,12 -99,9 +109,9 @@@ def check_subcommands client, arvados, 
      @sub = remaining_opts.shift
      if ['get', 'put', 'ls', 'normalize'].index @sub then
        # Native Arvados
 -      exec `which arv-#{@sub}`.strip, *remaining_opts
 +      exec_bin "arv-#{@sub}", remaining_opts
-     elsif ['less', 'check'].index @sub then
-       # wh* shims
-       exec_bin "wh#{@sub}", remaining_opts
      elsif @sub == 'docker'
 -      exec `which arv-keepdocker`.strip, *remaining_opts
 +      exec_bin "arv-keepdocker", remaining_opts
      else
        puts "Usage: arv keep [method] [--parameters]\n"
        puts "Use 'arv keep [method] --help' to get more information about specific methods.\n\n"