Merge change 7511 into donut

* changes:
  Support addPkcs12Keystore function in CertTool library.