Improve error message on server-side apply conflicts
Improve error message on server-side apply conflicts

Kubernetes-commit: a890331115340280bb1878c8baa46670cd6f0814

kubernetes/kubectl,kubernetes/kubectl