merge from latest repository of jetty-8