Update Grafana to 3.1.1
Fix problem with rc.script as well. Approved by: maintainer PR: 213355, 213407