Upgrade to tomcat-jdbc 7.0.42 and mysql-connector-java 5.1.25