Upgraded snmp4j to latest version (2.2.5) by using their oosnmp.net
maven repository. Made several minor code updates to use new snmp4j
API.
Merge remote-tracking branch 'origin/master' into feature-snmp4j2-upgrade
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
Updated the applicationContext-commonConfigs.xml
Update commonConfigs, tests pass maven clean install
Added applicationContext-commonConfigs.xml to some classes in Opennms-Services
Updated commonConfigs file
Update more Test to include commonConfigs xml
Updated more Tests to include commonConfigs.xml: opennms-services/opennms-webapp