am 21d20097: am 173086a3: Merge change 24620 into eclair

Merge commit '21d20097e7a2015ac8fb55ff38e0242899b43936'

* commit '21d20097e7a2015ac8fb55ff38e0242899b43936':
  Fix cert code to use the String form for TELETEX-encoded certs; see bug 2102191.