Merge branch 'master' of git.clinicalfuture.com:arvados

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

diff --cc sdk/cli/bin/crunch-job
index eb6b43eb03788d9d646323929636b72014bd989c,0fd8c9454559170afe6a7cd9cabd7fefe549a261..e3d0c1dc1f40565ed8e4b6f4f82fbb44d0d6519e
--- 1/sdk/cli/bin/crunch-job
--- 2/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@@ -546,9 -556,9 +556,10 @@@ for (my $todo_ptr = 0; $todo_ptr <= $#j
      $ENV{"TASK_SLOT_NODE"} = $slot[$childslot]->{node}->{name};
      $ENV{"TASK_SLOT_NUMBER"} = $slot[$childslot]->{cpu};
      $ENV{"TASK_WORK"} = $ENV{"JOB_WORK"}."/".$slot[$childslot]->{cpu};
 +    $ENV{"TASK_KEEPMOUNT"} = $ENV{"TASK_WORK"}."/keep";
      $ENV{"TASK_TMPDIR"} = $ENV{"TASK_WORK"}; # deprecated
      $ENV{"CRUNCH_NODE_SLOTS"} = $slot[$childslot]->{node}->{ncpus};
+     $ENV{"PATH"} = $ENV{"CRUNCH_INSTALL"} . "/bin:" . $ENV{"PATH"};
  
      $ENV{"GZIP"} = "-n";