Merge "Wait for Grafana service before running grafana.client"