Synch with trunk

(backport r1765974, r1830428, r1830439, r1834258, r1834259, r1834263)

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