Merge branch 'stable-2.10' into stable-2.11

* stable-2.10
  KVM: fix NIC configuration with absent NIC VLAN
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

lib/hypervisor/hv_kvm.py

@@ -1098,7 +1098,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
     if nic.nicparams[constants.NIC_LINK]:
       env["LINK"] = nic.nicparams[constants.NIC_LINK]
 
-    if nic.nicparams[constants.NIC_VLAN]:
+    if constants.NIC_VLAN in nic.nicparams:
       env["VLAN"] = nic.nicparams[constants.NIC_VLAN]
 
     if nic.network: