Merged from jetty-migration