Support for etcd >= v0.2.0-rc2; still need to adapt unit tests