Merge "- DiscoveryService yields to avoid hogging the cpu - SwitchManager getNodes...