OpenNMS Development: jira-NMS-10324 (21.1.0-SNAPSHOT)