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