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