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