OpenNMS Development: jira-NMS-6287 (21.0.0-SNAPSHOT)