Merge changes from Pool 2 to r1609323.

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