Fix WAR web.xml generation regression
Merge branch 'fix-mxwebxml'