OpenNMS Development: jira-NMS-10071 (21.1.0-SNAPSHOT)