Lock updates for jetty 9.0.6 and misc dev