Automatic merge from submit-queue (batch tested with PRs 39075, 39350, 39353) Move pkg/apiserver to pkg/genericapiserver/api