Merged KeystoreUtils into KeystoreManager