Changes for Tomcat 8, updated dependencies