Remove dependency on servlet-api from integration tests