Merge "Add configurable etcd storage feature"