Replace tomcat-dbcp with commons-dbcp 2.0