CS-14937: System VMs and Router VMs does not come up after upgrading from 3.0 to Bonita

Description:

	Reverting my earlier fix for bug 14937. The fix is
	not needed.

core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java

@@ -1479,7 +1479,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
                 s_logger.info("Prepare NIC device based on NicTO: " + _gson.toJson(nicTo));
 
                 Pair<ManagedObjectReference, String> networkInfo = prepareNetworkFromNicInfo(vmMo.getRunningHost(), nicTo);
-                if (_nexusVSwitch) {
+                if (mgr.getNexusVSwitchGlobalParameter()) {
                     String dvSwitchUuid;
                     ManagedObjectReference dcMor = hyperHost.getHyperHostDatacenter();
                     DatacenterMO dataCenterMo = new DatacenterMO(context, dcMor);