Fixed NMS-5904

LLDP Failure for non ifIndex references
Catched the NumberFormatException
Merge branch '1.12'