Merge "Use Keystone v3 API for getting users and tenants"