This reverts commit 393909d0cc. Reverte so that we can maintain authorship
393909d0cc
Fixes #14380 #23428
This change corrects problems reported by the `yamllint` linter. Since key duplication problems were removed in 4d48711, this commit mainly fixes trailing spaces and extra empty lines at beginning/end of files.
4d48711