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