Easy proposals to synch 2.4 and trunk

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