Merge remote-tracking branch 'origin/master' into 3504-clients-compatible-with-3036

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

diff --cc sdk/python/arvados/commands/put.py
index eec63c01d4c4bf557c4c5080438b0bb164bdc67e,e4b763ad0847cc420b3d8803b14dcbab124d24ff..8cf56b6a38ab864143ba2bac9927e5e22ea4129d
--- 1/sdk/python/arvados/commands/put.py
--- 2/sdk/python/arvados/commands/put.py
+++ b/sdk/python/arvados/commands/put.py
@@@ -445,10 -450,9 +450,10 @@@ def main(arguments=None, stdout=sys.std
          output = ','.join(writer.data_locators())
      else:
          # Register the resulting collection in Arvados.
-         collection = arvados.api().collections().create(
+         collection = api_client.collections().create(
              body={
                  'manifest_text': writer.manifest_text(),
 +                'owner_uuid': project_link['tail_uuid']
                  },
              ).execute()