move back to jetty 9
fix conflict