Propose r1638072 and r1638073.


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


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