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