Adds the wait-for-handoff-completion function to wait for the cluster to
converge before performing an operation