MFH: r424768 r424769

Update Grafana to 3.1.1

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

Add extra patch for the rc script

Submitted by: Andy Carrel
PR: 213355

Approved by: ports-secteam (with hat)