am b2a2836d: Merge changes Id496a60e,Ie7026d71

* commit 'b2a2836df6df3f2a70922f69806759535addee44':
  StandardNames: only remove DH_* for RI
  SSLSocketText: alert during test should throw