Skip file descriptor in JMX tests, since they don't exist on Windows
Merge branch '1.12'

Conflicts:
	opennms-services/src/test/java/org/opennms/netmgt/collectd/JMXCollectorTest.java
try changing to use InetAddressUtils and clean up initialization a bit
Merge branch '1.12'
update report to use Util to get datasource
another junit fix, OPENNMS-NMS112JDK17-TEST-25
Merge branch '1.12'
Merge branch 'master' into features/linkd-scalability