Merge branch 'master' into frlayout-stability
Sonar Cleanup
Cleaned up log messages.
Simplified ServiceConfigFactory so that it is no longer a singleton.
Deleted EventdConfigFactory and modified EventdConfigManager and xmls.
Merge branch 'master' into mrlambeth-master
Refactored CollectdInstrumentation into collection/api project.
Changed %n back to \n
Merge branch 'mrlambeth-master' of https://github.com/OpenNMS/opennms into mrlambeth-master
Updating OmnsSnmpCollector
Revert "Updating OmnsSnmpCollector"

This reverts commit eb57dd645f2d22df26671e2ab35277d48667f575.
Refactored Collectd code slightly to try and decouple it from the singleton
DataCollectionConfigFactory (and mostly failed).
Changed %n back to \n in SimpleServer.java and Conversation.java
Moved the Object classes for bridge Discovery

This is a first step for having a
simple unique object model
used by Enhanced Linkd and
Linkd
Renamed class for checking if vtp is enabled on cisco devices
Moved enlinkd snmp classes to their own package
Added a test for IpNetToMediaTableTracker
The qbridge forwarding table must be walked always

Added Test for Walking Bridge data
Added safe null check for weird snmp agent to fbd classes
Moved all the brudge discovery algorithm to model

The bridgeTopology class has been improved with new checking conditions for finding links