Changes for Servlet 3.0 and EL 2.2.
(OpenShift now has a Tomcat 7 cartridge.)