Merge change 21259 into eclair

* changes:
  Make certificate-handling-related constants public