Merge "Replace nova delete keypair with shade client."