Update Tomcats

This change updates to the latest versions of Tomcat 7 and 8
Merge branch 'update-tomcats'