On the 2.4.x branch:

Merged /httpd/httpd/trunk:r1784002,1784366,1784372



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