SPC-690 concurrency issue in linkd
Merge remote-tracking branch 'opennms/1.12'

Conflicts:
	opennms-services/src/main/java/org/opennms/netmgt/linkd/Linkd.java