Merge "Part of fix for bug 4997380: Some error types unknown to SslError"