#SB-90: Implement facility for managing keys in the keystore and truststore

- Touch-ups.
- Do not delete the keystore.