Don't upgrade cluster until all nodes are upgraded

This was breaking the 2.0 -> 2.1 upgrade