Merge "VNC harcoded server name removed" into mcp/pike