Merge change 5615 into donut

* changes:
  Implement the generic mini-keystore for security.