kontrol: checkRetry is spamming etcd

Disable it by returning simply an error. Otherwise subsequent calls are
made which are ddosing the server. go-etcd should be smart, but is not.
Merge branch 'master' into postgres-kontrol

Conflicts:
	kontrol/storage.go