Update Tomcat version

This change updates the Tomcat used to the latest release version,
7.0.52
Merge branch 'update-tomcat'