Automatic merge from submit-queue (batch tested with PRs 38194, 37594, 38123, 37831, 37084) remove unnecessary fields from genericapiserver config Cleans up some unnecessary fields in the genericapiserver config.