Merge changes Id496a60e,Ie7026d71

* changes:
  StandardNames: only remove DH_* for RI
  SSLSocketText: alert during test should throw