Fixed minor typo
Initial implementation of etcd configuration
Merge branch 'feature/etcd' into develop