Merge "OPNFLWPLUG-1062 Include additional LLDP fields in liblldp"