COR-282: Upgrade the servlet api to 3.0