Merge pull request #3150 from rpv-tomsk/libvirt-3