Moved cluster map state change blocking to ClusterMapReader