Automatic merge from submit-queue (batch tested with PRs 43513, 43499)

Make kubectl replace unconditional

second attempt at https://github.com/kubernetes/kubernetes/pull/43192

rather than a retry, make the replace unconditional, which works reliably