Merge change 21645 into donut

* changes:
  Make SSL error a bit more human readable.