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