Merge branch 'release-8' into jetty-8