copy over latest web.xml from cocoon-webapp; remove cocoon.xconf as it isn't necessary to have an explicit one anymore