Updating for Jetty 9.0.x
Merge branch 'master' into jetty-9