Merge "Make services_client use **kwargs"