Added new Implementation for Bridge Discovery

Added a new way for bridge discovery
Added test for this way
Still failing!
Merge branch 'master' into features/TS
Merge branch 'master' into features/TS
Merge branch 'master' into features/TS
Fixing bug NMS-6463 - The Upgrade Tools are throwing a NPE when a JMX service is not configured properly on collectd-configuration.xml
add explicit postgresql dependency to make sonar happy
Merge remote-tracking branch 'origin/1.10' into 1.12

Conflicts:
	pom.xml
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	core/upgrade/src/main/java/org/opennms/upgrade/implementations/JmxRrdMigratorOffline.java
we aggregate, so we do not really need this
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge remote-tracking branch 'origin/1.12'
Ported a bunch of changes over from the feature-hibernate4-upgrade
branch. Migrated from using HibernateTemplate to using thread-local
Sessions by calling SessionFactory.getCurrentSession(). Added
transactional wrappers to Capsd and Linkd init. Added a data source
that will fetch the current DB connection from an existing Hibernate
Session. This data source is used with Spring's JdbcTemplate so that
JDBC operations happen in the same transaction as Hibernate operations.
Fixed UpsertTest by running DB setup in a separate transaction so that records are
committed to the database before the upsert operation begins.
sonar correctness
lots of equals() fixes
Fixed path parsing on Windows where File.separator is a backslash.
Fixes bug NMS-6465.
keyset cleanups
Sonar cleanup.
thinko
Merge remote-tracking branch 'origin/master' into features/sonar-cleanup