Merge "Make compute keypairs_client use rest_client"