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