more capsd-related changes
Merge branch '1.12'

Conflicts:
	opennms-services/src/test/java/org/opennms/netmgt/linkd/LinkdNms10205aCapsdNetworkBuilderTest.java
	opennms-services/src/test/java/org/opennms/netmgt/linkd/LinkdNms10205aOspfTest.java
	opennms-services/src/test/java/org/opennms/netmgt/linkd/LinkdNms10205bCapsdNetworkBuilderTest.java
	opennms-services/src/test/java/org/opennms/netmgt/linkd/LinkdNms10205bLldpTest.java
	opennms-services/src/test/java/org/opennms/netmgt/linkd/LinkdNms10205bOspfTest.java
	opennms-services/src/test/java/org/opennms/netmgt/linkd/LinkdNms10205bTest.java
	opennms-services/src/test/java/org/opennms/netmgt/linkd/LinkdNms1055OspfTest.java
	opennms-services/src/test/java/org/opennms/netmgt/linkd/LinkdNms17216CapsdNetworkBuilderTest.java
	opennms-services/src/test/java/org/opennms/netmgt/linkd/LinkdNms17216LldpTest.java
	opennms-services/src/test/java/org/opennms/netmgt/linkd/LinkdNms4930Test.java
	opennms-services/src/test/java/org/opennms/netmgt/linkd/capsd/Nms1055CapsdNetworkBuilderTest.java
	opennms-services/src/test/java/org/opennms/netmgt/linkd/snmp/Nms10205bLldpTest.java
	opennms-services/src/test/java/org/opennms/netmgt/linkd/snmp/Nms10205bOspfTest.java
	opennms-services/src/test/java/org/opennms/netmgt/linkd/snmp/Nms1055LldpTest.java
	opennms-services/src/test/java/org/opennms/netmgt/linkd/snmp/Nms17216CdpTest.java
	opennms-services/src/test/java/org/opennms/netmgt/linkd/snmp/Nms17216LldpTest.java
Merge branch 'master' into pull-requests