Merge branch 'master' into 3198-writable-fuse

diff --cc sdk/python/arvados/arvfile.py
index 2d44d6ad6ee8527b88815b21891dd33a278584f5,95dcea0ad3dc28596fc7857256ef5aafc96583b5..3009a90fa6099a7ba06ed6d8e988569f57ab64c3
--- 1/sdk/python/arvados/arvfile.py
--- 2/sdk/python/arvados/arvfile.py
+++ b/sdk/python/arvados/arvfile.py
@@@ -9,9 -9,8 +9,9 @@@ import Queu
  import copy
  import errno
  import re
 +import logging
  
- from .errors import KeepWriteError, AssertionError
+ from .errors import KeepWriteError, AssertionError, ArgumentError
  from .keep import KeepLocator
  from ._normalize_stream import normalize_stream
  from ._ranges import locators_and_ranges, replace_range, Range

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