Merge "Make keypairs_client use **kwargs"