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