CMS-1230 Upgrade to servlet 3.0. Requires a Servlet 3.0 container (tomcat 7.x etc).