This ends up being a big commit that has touched a lot of the codebase.
Proxy configs are in and tested as being functional.
The POM has been updated and we have a slightly different set of dependencies.
web.xml cleanup
Some formatting updates.