Upgrade to Tomcat 8 RC5