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