OpenNMS Development: jira-HZN-1564 (25.0.0-SNAPSHOT)