Merge pull request #16976 from juanvallejo/jvallejo/pick-upstream-45743

Automatic merge from submit-queue.

UPSTREAM: 45743: pick 45743 to fix config groupversion defaults

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1503910

Picks upstream changes introduced in https://github.com/kubernetes/kubernetes/pull/45743/files
which fix a bug where setting kubernetes defaults on a rest config would sometimes overwrite its ContentConfig.GroupVersion field with the wrong group version - causing resources such as `cronjob.v2alpha1.batch` to return an error [1] when attempted to be described through `oc`.

1.
```
$ oc describe cronjob existing-cronjob
Error from server (NotFound): the server could not find the requested resource
```

cc @deads2k @fabianofranz

Author: openshift-merge-robot