Upgrade to JSF 2.2 and Tomcat 8