Fix failing tests and upgrade websocket to Jetty 9.0.5