am 31eaa481: Fix missing delete_keypair and delete_all

* commit '31eaa48123bd3bf0a5603ab908cfe9987c2c5ea9':
  Fix missing delete_keypair and delete_all