re-enable scalatra-jetty and update servlet-api