426658 backport Bug 425930 to jetty-8