Race

Merge with ben's fix.
Fix all data races in etcd.