Merge "Split out keystone tenant client"