Merge "Support testing nova-novncproxy on SSL"