OpenNMS Development: jira-NMS-12430-backport (25.0.0-SNAPSHOT)