Merge change 6204 into donut

* changes:
  Migrate to new keystore with the CertTool lib.