Fix server.xml patches to match new format