jetty: merge 7.6.13 history