Merge "Split services client out of keystone v2 identity client"