Moved etcd code to gommons repo
Merged master