Code clean up and minor changes whilst working on integration with AS8 domain management.
Begin working on Servlet 3.1 implementation
Add tests for the upgrade mechanim