Upgrade servlet api to 3.1.0