Merge "Split endpoints-client out of keystone v2 identity client"