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