Merge "Allow disabling etcd3"