Automatic merge from submit-queue (batch tested with PRs 38957, 41819, 41851, 40667, 41373) Fix deployment helper - no assumptions on only one new ReplicaSet #40415 **Release note**: ```release-note NONE ``` @kubernetes/sig-apps-bugs