web.xml from default 5.5 install
urlrewrite.xml from default 5.5 install

Only change seems to be removing our redirects, so we can just use the
5.4 file.
server.xml from default 5.5 install

This doesn't seem to have added anything new, so I think we can just
drop our 5.4 file in there.
Attempted fixed files for 5.5 install

Summary of changes:
- web.xml has one change (in this commit)
- server.xml, customised version from 5.4
- urlrewrite.xml also uses our customised version from 5.4

Will deal with ConfluenceActionSupport.properties in a separate commit.
Ignoring favicon.
ConfAcSup.properties from default 5.5 install

Looks like the changes could be significant, so I'm going to go in
manually again and change things
Attempted fix for ConfAcSup.properties after 5.5

Quite a bit had changed, having investigated it, so I've gone back
through and put in the changes we care about. Plus fixing a bit of title
case that would annoy me.
confluence.cfg.xml from 5.5 upgrade