Adjusting Servlet 3.1 API use (to be compliant with Tomcat 8)