change this test to be id-agnostic
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-services/src/test/java/org/opennms/netmgt/linkd/LinkdNms17216Test.java