Merge branch 'master' into 2798-go-keep-client

diff --cc sdk/python/run_test_server.py
index 9901e14123f92aea4672b52814481faa5327b409,ba1df86753200b8f6bac3632461ccf52063ab892..dbb4ff066d4c880f3af05624950b063a4f366805
--- 1/sdk/python/run_test_server.py
--- 2/sdk/python/run_test_server.py
+++ b/sdk/python/run_test_server.py
@@@ -149,13 -149,10 +149,14 @@@ def run_keep()
      _start_keep(0)
      _start_keep(1)
  
 +
 +    os.environ["ARVADOS_API_HOST"] = "127.0.0.1:3001"
 +    os.environ["ARVADOS_API_HOST_INSECURE"] = "true"
 +
      authorize_with("admin")
      api = arvados.api('v1', cache=False)
-     a = api.keep_disks().list().execute()
+     for d in api.keep_services().list().execute()['items']:
+         api.keep_services().delete(uuid=d['uuid']).execute()
      for d in api.keep_disks().list().execute()['items']:
          api.keep_disks().delete(uuid=d['uuid']).execute()