Backport r639079 and r468042. This patch also lacked the

corresponding CHANGEs entry, so I grabbed from trunk


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