Port code clean up and a memory leak fix from Pool2 trunk

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