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