reverting. got feedback that maybe we don't want to merge 4-5,1-2 into 1-5

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162436 13f79535-47bb-0310-9956-ffa450edef68