Upgrade to Tomcat 7.0.54

Closes #960