Update to latest servlet API