Upgrade to use Jetty v9