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