Merge invirt-console-server into invirt-console (LP: #305681)