Add some notes about cherry-picking
Fix typo
Merge pull request #13581 from basepi/releasecherrypick

Add some notes about cherry-picking