Merge "Make identity v2 user_client use **kwargs"