OpenNMS Development: jira-NMS-9681 (21.0.2-SNAPSHOT)