Merge "Use server hostname when creating secure websocket"