Merge remote-tracking branch 'origin/jetty-7' into jetty-8