Automatic merge from submit-queue (batch tested with PRs 42895, 45940)

apiserver: no Status in body for http 204

Fixes http writer errors as with 204 we must not send any body.

Needed downstream for https://github.com/openshift/origin/issues/14213.