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