Upgrade to Servlet API 2.5