Support Jetty 9.x deploy

I think that I did not break anything, please merge it :)