Merge "Make identity v2 tenants_client use **kwargs"