* master: (262 commits)
  pkg/services/dashboards/dashboard_service.go: simplify return
  Updated url query param encoding to exctly match angular encoding
  Updated snapshot
  Added missing props not being passed to scrollbar component, fixes #15058
  Document /api/health
  changelog: adds note for #15062
  change default rotate_token_minutes to 10 minutes
  fix
  load test/ha fixes
  set low login cookie rotate time in ha mode
  fix multiple piechart instances bug
  scripts/build/*: Fix some golint issues
  scripts/build/*: Fix golint issues Url => URL
  build: fixes building grafana completely within docker.
  dont specify domain for auth cookies
  New snapshot reflecting changes
  Makes the clickable side menu header look great in light theme again
  org id fix for load test
  user auth token load tests using k6.io
  moves cookie https setting to [security]
  ...

pkg/services/dashboards/dashboard_service.go: simplify return

See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck  ./...
pkg/services/dashboards/dashboard_service.go:167:2:warning: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) (megacheck)

Updated url query param encoding to exctly match angular encoding

Added missing props not being passed to scrollbar component

Bug Fix #14961

Use CustomScrollbar in explore 

More file re-organization & clean-up

Document /api/health

Makes the clickable side menu header look great in light theme again

Document the health check implemented in #3302 (and #935), see  https://github.com/grafana/grafana/issues/3302#issuecomment-297066201

fix multiple piechart instances bug

WIP. POC for session replacement base hashed tokens. 

See,

$ gometalinter --vendor --disable-all --enable=golint ./...
build/release_publisher/externalrelease.go:55:6:warning: type getHttpContents should be getHTTPContents (golint)
build/release_publisher/publisher.go:18:2:warning: struct field apiUri should be apiURI (golint)
build/release_publisher/publisher.go:66:6:warning: exported type ReleaseType should have comment or be unexported (golint)
build/release_publisher/publisher.go:69:2:warning: exported const STABLE should have comment (or a comment on this block) or be unexported (golint)
build/release_publisher/publisher.go:185:16:warning: should replace errors.New(fmt.Sprintf(...)) with fmt.Errorf(...) (golint)
build/release_publisher/publisher_test.go:102:6:warning: type mockHttpGetter should be mockHTTPGetter (golint)

$ gometalinter --vendor --disable-all --enable=golint ./... | grep -i URL
build/publish.go:18:5:warning: var apiUrl should be apiURL (golint)
build/publish.go:184:2:warning: struct field WhatsNewUrl should be WhatsNewURL (golint)
build/publish.go:185:2:warning: struct field ReleaseNotesUrl should be ReleaseNotesURL (golint)
build/publish.go:191:2:warning: struct field Url should be URL (golint)
build/release_publisher/externalrelease.go:17:53:warning: method parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/externalrelease.go:17:69:warning: method parameter whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/externalrelease.go:17:89:warning: method parameter releaseNotesUrl should be releaseNotesURL (golint)
build/release_publisher/localrelease.go:20:45:warning: method parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/localrelease.go:20:61:warning: method parameter whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/localrelease.go:20:81:warning: method parameter releaseNotesUrl should be releaseNotesURL (golint)
build/release_publisher/localrelease.go:45:41:warning: method parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/localrelease.go:51:84:warning: func parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/main.go:12:6:warning: var whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/main.go:13:6:warning: var releaseNotesUrl should be releaseNotesURL (golint)
build/release_publisher/main.go:40:6:warning: var baseUrl should be baseURL (golint)
build/release_publisher/main.go:94:6:warning: func createBaseUrl should be createBaseURL (golint)
build/release_publisher/publisher.go:21:2:warning: struct field baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/publisher.go:26:17:warning: interface method parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/publisher.go:26:33:warning: interface method parameter whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/publisher.go:26:53:warning: interface method parameter releaseNotesUrl should be releaseNotesURL (golint)
build/release_publisher/publisher.go:29:31:warning: method parameter whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/publisher.go:29:51:warning: method parameter releaseNotesUrl should be releaseNotesURL (golint)
build/release_publisher/publisher.go:91:24:warning: method getUrl should be getURL (golint)
build/release_publisher/publisher.go:91:31:warning: method parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/publisher.go:190:15:warning: func parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/publisher.go:199:21:warning: method apiUrl should be apiURL (golint)
build/release_publisher/publisher.go:257:2:warning: struct field WhatsNewUrl should be WhatsNewURL (golint)
build/release_publisher/publisher.go:258:2:warning: struct field ReleaseNotesUrl should be ReleaseNotesURL (golint)
build/release_publisher/publisher.go:264:2:warning: struct field Url should be URL (golint)
build/release_publisher/publisher_test.go:10:3:warning: struct field whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/publisher_test.go:11:3:warning: struct field relNotesUrl should be relNotesURL (golint)
build/release_publisher/publisher_test.go:17:3:warning: struct field expectedUrl should be expectedURL (golint)
build/release_publisher/publisher_test.go:18:3:warning: struct field baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/publisher_test.go:109:2:warning: var whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/publisher_test.go:110:2:warning: var relNotesUrl should be relNotesURL (golint)

Fixes #15060

* master: (32 commits)
  Fixed react key warning for loki start page
  Disable query should trigger refresh
  added docs entry for check_for_updates config flag, fixes ##14940
  Explore: Fix scanning for logs
  Moved ad hoc filters and upload directive
  Moved dashboard srv and snapshot ctrl
  Moved share modal
  Moved dashboard save modals to components folder
  Moved unsaved changes service and modal
  Removed unused alertingSrv
  Moved view state srv to services
  Moved timepicker to components
  Moved submenu into components dir
  Moved dashboard settings to components
  Moved dashboard permissions into components dir
  Moved history component, added start draft of frontend code style guide
  fix: Use custom whitelist for XSS sanitizer to allow class and style attributes
  Began work on improving structure and organization of components under features/dashboard, #14062
  Fix a typo in changelog
  Update ROADMAP.md
  ...