Fixed detection of zone/kvm
Merge branch 'test' into dev