Merge "Revert "Remove etcd and kafka dependencies from voltha""