Set provided scope for servlet-api and remove commons-httpclient.