Merge "Fix test_novnc to adequately validate websocket upgrade"