Merge "Update Jetty version to 9.2"