Merge branch 'jetty-9.2.x' into feature/jetty-9.2-alt-servlet-mappings