Merge change 7687 into donut

* changes:
  Add UI to handle PKCS12 cert.