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