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