Merge "BUG-4032: Missing topology-lldp-discovery config"