fix to work with JDK 1.7 ordering
reformat
Merge branch '1.12'
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'
SPC-616, NCSPathProvider auth issue fix
Fixed NMS-5904
Fixed NMS-5904
remove service elements from showing in the NCS Service accordian list
add defaults for username and password
format
remove dependencies
a few cleanups for the eventd stresser
Merge branch '1.12'
Merge branch 'master' of git://github.com/OpenNMS/opennms