Merge "Enable netchecker to use etcd"