Merge "BUG 2820 - LLDP refactor"