Change to use embedded jetty and the latest version of jetty