Added UNCOMMENT to linkdiscovery, topologymanager