CFY-1590 keypair type now supports passing existing public key