Merge "Split out roles client from keystone identity client"