refactor(etcd): Gather etcd-related code in etcd pkg
Merge pull request #508 from bcwaldon/etcd-pkg

Gather etcd-related code in etcd pkg