bug 1229: "CA" -> "certificate authority (CA)"
Merge branch 'bug-1229' into testserver-stable