Merge "Use service catalog_type when getting the heat/glance clients"