Merge branch 'master' into 2221-complete-docker

Conflicts:
	sdk/cli/bin/crunch-job

diff --cc sdk/cli/bin/crunch-job
index 2b31531a52fab57543ff5432a5285f8070c7aa40,04f2b01fcf7220d3eb8ae17b7a8eafd31c3ed949..40b0033757c8aeb03960ff397d9f311bca21314b
--- 1/sdk/cli/bin/crunch-job
--- 2/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@@ -71,9 -77,10 +77,10 @@@ use POSIX ':sys_wait_h'
  use Fcntl qw(F_GETFL F_SETFL O_NONBLOCK);
  use Arvados;
  use Getopt::Long;
 -use Warehouse;
 -use Warehouse::Stream;
 -use IPC::System::Simple qw(capturex);
 +use IPC::Open2;
 +use IO::Select;
 +use File::Temp;
+ use Fcntl ':flock';
  
  $ENV{"TMPDIR"} ||= "/tmp";
  unless (defined $ENV{"CRUNCH_TMP"}) {