Synch (a bit) with trunk

Backport r1643118 + some manual tweaks regarding left-over in previous backports

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