merge from jetty-8