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

Fixed an NPE after the merge to master.