Merge branch 'libs/jetty/upstream' into libs/jetty/local