Merge r307195 from trunk:

* Fix PR36883 (mod_proxy_ajp and tomcat issues).

Submitted by: William Barker <william.barker wilshire.com>
Reviewed by: Ruediger Pluem


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