Merge "Add etcd ha test cases"