Merge pull request #3147 from rpv-tomsk/libvirt