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