OpenNMS Development: jira-NMS-9684 (25.0.0-SNAPSHOT)