Merge branch 'jetty-8' into release-8