Merge change 3427 into donut

* changes:
  First version of the keystore service.