Revert calicoctl.conf back to etcdv2

Change-Id: I866b97a0ebd03d7d520b0fc158dff71a20890302
Related-PROD: PROD-19006
2 files changed