Jetty v9 and some fixes
Merged with upstream