Merge branch 'jetty-9.x' into dev
jetty: Merge 7.6.11 history