Merge "websocketmanager now listens on a custom jetty port"