update report to use Util to get datasource
another junit fix, OPENNMS-NMS112JDK17-TEST-25
Merge branch '1.12'
Merge branch 'master' into pull-requests