Merged branch 'jetty-9.1' into 'http_client_connection_factories'.