Fix merge issue
Add support for Jetty 9.0.0.RC0