Merge branch 'master' of https://github.com/coreos/etcd into remove_omitempty_on_value

Conflicts:
	store/store.go