Merge "Add LLDP retry count to config.ini"