Various fixes:
 - Use Commons DBCP rather than commons-dbcp
 - Differentiate between DBCP 1.x and 2.x
 - Update for improvements in DBCP (mostly in Pool actually) around synchronization
 - Remove stagnant point
Reduce line length to aid readability.

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