Keep pace with DBCP2 changes (just various bits of clean-up)

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