Merge "Make endpoints_client use **kwargs"