Merge "Unhardcoding libvirt group name parameter for socket. Upgrade path"