Merge "Make novnc test compatible with RFB3.3"