Begin working on Servlet 3.1 implementation
Add tests for the upgrade mechanim