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