Merge "Add missing service.grafana.collector class"