Merge backport proposals and roll all-in-one 2.2.x patch

as suggested by jim and rpluem


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