This reverts commit 3d776851.

Prepended first line to export file containing
`sep=;\n`
which I believe should be all that is required for Excel to interpret the CSV file as semicolon delimited.

Merge branch 'cancel-in-flight-repeats' of https://github.com/stuartnelson3/grafana into stuartnelson3-cancel-in-flight-repeats

Conflicts:
	conf/defaults.ini
	pkg/setting/setting.go
	public/app/core/components/grafana_app.ts
	public/app/core/core.ts
	public/app/features/dashboard/dashboardCtrl.js

feat(graph): graph tooltip sort order PR refactored/changed #4944, changed the layout graph display options, #4944

Implemented nested template variables functionality for Opentsdb

Due to a bug in golang the 64bit variable i
need to come first to be 64bit aligned.
https://golang.org/pkg/sync/atomic/#pkg-note-BUG

closes #5341

update pricing to include 1 million free API requests per month

Previously, if a user changed the query between
requests, the previous query would not be
canceled. This handles that edge-case.

Depending on context in the code, rename cacheKey
to exprID when it identifies a unique expression,
and rename cacheKey to requestID when it is
identifying a request.

Allow the datasource to decide how to handle a
canceled request.

Responsibility is now to pass the cacheKey through
to `datasourceRequest` in each datasources'
implementation of `query`.

Conflicts:
	public/app/plugins/datasource/influxdb/query_part.ts

feat(prometheus): restore old prometheus query editor, revert this commit in prometheus query editor v2 branch

Repeat Prometheus requests with the same query
will cancel preceding requests.