big cleanup so master_slave -> bare_cluster transition works properly and the cluster gets bootstrapped