fix for http://bamboo.internal.opennms.com:8085/browse/OPENNMS-NMS112JDK17-TEST-3/test/case/63996979
Merge branch '1.12'

Conflicts:
	opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/DataLinkInterfaceDaoHibernateTest.java