Merge change 6081 into donut

* changes:
  Migrate to the CertTool library.