Propose r1622450 and r1626978.


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