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