Updates to jetty 9