Lock updates for jetty 9.0.7 and misc dev