this test is hard to change; it is much nicer in 1.12+, just skip it
or, duh, just delete it
fix capsd integration test to not conflict with 172.20.1.x
ugh, extending timeouts makes this pass
fix SSH monitor test for ubuntu banner
disable JDBC web notification tests, the code will be removed in master

Conflicts:
	opennms-webapp/src/test/java/org/opennms/web/notification/JdbcWebNotificationRepositoryTest.java
	opennms-webapp/src/test/resources/jdbcWebRepositoryTestContext.xml
remove tests for deprecated jdbc bits which are not postgresql 9.3 compatible

Conflicts:
	opennms-webapp/src/test/java/org/opennms/web/alarm/filter/AlarmRepositoryFilterTest.java
	opennms-webapp/src/test/java/org/opennms/web/event/JdbcWebEventRepositoryTest.java
	opennms-webapp/src/test/java/org/opennms/web/event/filter/WebEventRepositoryFilterTest.java
	opennms-webapp/src/test/java/org/opennms/web/outage/JdbcWebOutageRepositoryTest.java
deprecated in 1.12, removed in master

Conflicts:
	opennms-webapp/src/main/java/org/opennms/web/notification/JdbcWebNotificationRepository.java
ensure test order on JDK 1.7+

Conflicts:
	opennms-config-tester/src/test/java/org/opennms/netmgt/config/tester/ConfigTesterTest.java
1) add annotations, 2) ???, 3) PROFIT!
make sure smoke-test prereqs are built too
umm... oops?
Merge branch '1.10' into space/14.1-enlinkd

Conflicts:
	opennms-webapp/src/test/java/org/opennms/web/svclayer/DefaultOutageServiceIntegrationTest.java
Adding dao for enhanced linkd bridge discovery
fix merge error
have to make sure we are in the right dir
Merge remote-tracking branch 'origin/1.10' into space/14.1-enlinkd
Adding Bridge Dao for enhancel linkd
Merge branch 'space/14.1-enlinkd' of github.com:OpenNMS/opennms into space/14.1-enlinkd
Added stpportpathcost to stp link