Propose CL/TE fixes

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