Edits to mak WAR deployment in Tomcat7 work