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