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