Tomcat connection pool
Merge with master