Automatic merge from submit-queue

[etcd] Reduce the etcd surface area in the integration test to minimize deps

This is a code refactor for isolation of client usage.