OpenNMS Development: jira-HZN-1558 (24.1.0-SNAPSHOT)