Merge invirt-remote-host and invirt-remote-server into invirt-remote