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