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