Fix ifindex calc and updated lldp support for Avaya/Nortel