Merge "Replace flux wait with control plane wait"