Automatic merge from submit-queue (batch tested with PRs 39223, 40260, 40082, 40389) Use metav1.*Options in genericapiserver Treat DeleteOptions as unversioned in metainternalversion for decoding of bodies from older clients. Use the metav1 Options structs from generic api server and the appropriate codec. Completes the move to using generic server side code for API objects @sttts