OpenNMS Development: pr-jira-NMS-9080 (21.0.0-SNAPSHOT)