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