Invalid keys when switching smartcard from ed25519 to other curves

[Trevor Bentley]

> Thanks, applied (STABLE-BRANCH-2-2 and master).

Thanks!  What is the master->stable branch process like?  Should git 
commit af3efd149f555d36a455cb2ea311ff81caf5124c also have gone into a 
stable branch, or will it be moved over eventually?  That commit is 
arguably more important, as their is no workaround.

-Trevor