Add initial support for etcd
Merge pull request #11332 from techhat/etcd

Add initial support for etcd