Conflicts:
	pkg/components/imguploader/s3uploader.go

feat(alerting): fixed s3 upload issue, progress on alerting on null/missing data, updated ini package to get the support for line continuations

torkels commit will fix this unit test :)

Merge branch 'custom-github-style-oauth' of https://github.com/kfitzpatrick/grafana into kfitzpatrick-custom-github-style-oauth

Conflicts:
	pkg/services/alerting/eval_context.go

Update systemd unit's description to be more understandable

Signed-off-by: Christopher Meng <i@cicku.me>

ref #5855

closes #5851

fix(graph): fixed issue with duplicate metric calls when doing full page reload of  graph in edit/view mode

closes #5883

ref #5883