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