Merge pull request #3149 from rpv-tomsk/libvirt-2