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