Backport recent changes by jsl (see r1.9 HEAD) plus transformation.

PR:
Obtained from:
Submitted by:
Reviewed by:


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