Begin fix LLDP problems. references #2289