OpenNMS Development: cg-jira-NMS-12473-f18 (21.1.0-SNAPSHOT)