OpenNMS Development: jira-NMS-9743-v2 (21.0.2-SNAPSHOT)