Replaced servlet and servlet mapping in web.xml with Servlet 3.0
annotation
Reverse the previous change - it was not supposed to be in the develop
branch