Merge "Split users_client from keystone V3 client"