7d9e45b223
Merge commit 'd45dcbec856710f9478ffc5689e7cdf95d757ab8' * commit 'd45dcbec856710f9478ffc5689e7cdf95d757ab8': Implement the generic mini-keystore for security.