10383: Merge branch 'master' into 10383-arv-put-incremental-upload

diff --cc sdk/python/arvados/arvfile.py
Simple merge

diff --cc sdk/python/arvados/commands/put.py
index 88956cdce69696f91730fd0eb2adc5430c9b3a08,e3b41b26d370abbd37210ae477ea25002b66c781..88d5a79d48ff867573afec933fb5f1fb561ce318
--- 1/sdk/python/arvados/commands/put.py
--- 2/sdk/python/arvados/commands/put.py
+++ b/sdk/python/arvados/commands/put.py
@@@ -22,8 -20,10 +22,9 @@@ import socke
  import sys
  import tempfile
  import threading
 -import copy
 -import logging
 +import time
  from apiclient import errors as apiclient_errors
+ from arvados._version import __version__
  
  import arvados.commands._util as arv_cmd
  

diff --cc sdk/python/tests/test_arv_put.py
Simple merge