[master] Fix for https://java.net/jira/browse/GRIZZLY-1540 (grizzly-servlet fails to compile with the final Servlet 3.1 api.).