Improved snapshot size calculation for KVM vm's
Merge branch 'test' into dev