Automatic merge from submit-queue

Adding patch and cleaning up namespace code

cc @kubernetes/sig-api-machinery