switching to Grafana 1.8.1
Merge branch 'grafana-1.8.1' into sgg-private