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