features: reduce risk of merge conflicts
features: reduce risk of merge conflicts

Merge conflicts become less likely when:
- features are sorted alphabetically because
  then changes are more likely to be done in
  different parts of the files
- blank lines separate the hash entries because
  gofmt then doesn't change the formating of
  other entries when adding or removing one

Merge conflicts where pretty common shortly before a code freeze when everyone
added new features at the end of the files.

Kubernetes-commit: 85513e4bca6d34a8bb034165079dca176fbf2e4e

kubernetes/apiserver,kubernetes/apiserver