Merge "Switch from $DEST/data/etcd to $DATA_DIR/etcd"