Merge r573939 from trunk:

Escape error-notes correctly
PR 40952

Submitted by: niq
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@574943 13f79535-47bb-0310-9956-ffa450edef68