Reverted to servlet 2.5 for Heroku to work with Jetty 7