move jetty from merge to dist to allow replacement