Minor fixes: Typos, Formatting, code, YAML code block
Add missing new line at the end of file
revert incorrect fix
Merge pull request #3208 from bicpi/more_fixes_2_3

2.3 only: Some more minor fixes