Merge pull request #2109 from apache/fix_changelog

Fix changelog and upgrade notes for the new release