Merge "Make identity v2 service_client use **kwargs"