Fix of #SPC-610
Fixed NMS-5904

LLDP Failure for non ifIndex references
Catched the NumberFormatException
Merge branch 'master' of github.com:OpenNMS/opennms
Fixed NMS-5904

LLDP Failure for non ifIndex references
Catched the NumberFormatException
Merge branch '1.12'
Merge branch 'master' into pull-requests