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