Port some code clean-up from Pool2 trunk.

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