Merge "Enabling LLDP programming again. Upon debugging, it was found that the timeout...