fix(mod): redirect dashboard to /dashboard
Merge pull request #324 from philips/redirect-mod-dashboard-trailing-slash

fix(mod): redirect dashboard to /dashboard
feat(watch/cancel): cancel watchers after the response is returned
test(watch/cancel): update tests for changed Watch function
Merge branch 'master' of github.com:coreos/etcd into stream

* 'master' of github.com:coreos/etcd:
  fix(mod): redirect dashboard to /dashboard
Merge branch 'cancel' into stream

* cancel:
  test(watch/cancel): update tests for changed Watch function
  feat(watch/cancel): cancel watchers after the response is returned

Conflicts:
	server/v1/watch_key_handler.go
	server/v2/get_handler.go
	store/store.go
	store/store_test.go
	store/watcher_hub.go
	store/watcher_test.go
fix(watch/stream): do not delete the watcher until the connection closes
test(watch/stream): fix watcher tests
chore(watch/cancel): protect watcherHub with a lock
chore(watch/cancel): rename watcher.Cancel() to watcher.Remove()
Merge branch 'cancel' into stream_cancel

* cancel:
  chore(watch/cancel): rename watcher.Cancel() to watcher.Remove()
  chore(watch/cancel): protect watcherHub with a lock

Conflicts:
	store/watcher_hub.go
	store/watcher_test.go
test(watch/stream): add new test from streaming watch mode