Automatic merge from submit-queue clean up generic apiserver options Clean up generic apiserver options before we tag any levels. This makes them more in-line with "normal" api servers running on the platform. Also remove dead example code. @sttts