5.4 upgrade: web.xml
5.4 upgrade: web.xml merged properly
5.4 upgrade: urlrewrite.xml
5.4 urlrewrite: merged properly