OpenNMS Development: jira-NMS-9711 (21.0.1-SNAPSHOT)