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