This was my entire intended commit. But as an alternate strategy, you can

svn up to r1775787. Not that I intended it, and absolutely not the way we
should apply it (revert layer by layer 6 commits replicated on the merge
branch, then apply merge branch in one commit, IMO.)

Sorry folks ;-/


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