Merge change 24132 into eclair

* changes:
  Add two CertTool helper classes.