Fix .war build and tomcat 8 support