Add formatting rules for .yml files to editorconfig.
Merge branch 'master' into 2.5
Merge branch '2.5' into 2.6