format + (hopefully) test fix for OPENNMS-NMS112JDK17-TEST-22
Merge branch '1.12'

Conflicts:
	opennms-dao/src/test/java/org/opennms/netmgt/dao/MonitoredServiceDaoTest.java
Merge branch 'master' into pull-requests