Update to Tomcat 7.0.56

Closes gh-1710
Merge branch '1.1.x'