Move cluster verification out of prepare-node-join