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