WS-281: Upgrade the servlet api to 3.0