Merge "VNC harcoded server name removed"