Merge branch 'master' into 2752-arv-put-resume-wip

Conflicts:
	sdk/python/arvados/errors.py

diff --cc sdk/python/arvados/errors.py
index f206c1dc7926b5a498f155be9c3cbbfe3b01c220,b4afb21f1131f16199e0011952d418f30218765d..03476425c34526ebd280cd1fc05b343d40f2ebca
--- 1/sdk/python/arvados/errors.py
--- 2/sdk/python/arvados/errors.py
+++ b/sdk/python/arvados/errors.py
@@@ -14,5 -14,5 +14,7 @@@ class KeepWriteError(Exception)
      pass
  class NotImplementedError(Exception):
      pass
 +class StaleWriterStateError(Exception):
 +    pass
+ class NoKeepServersError(Exception):
+     pass

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

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

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