OpenNMS Development: jira-NMS-10721-drift2 (25.0.0-SNAPSHOT)