OpenNMS Development: jira-NMS-9684 (21.0.0-SNAPSHOT)