399669 - Remove WebSocketConnection in favor of websocket.api.Session
399568 - OSGi tests can't find websocket classes

+ Changing classloading in WebSocketServlet to be more OSGi friendly