Merge pull request #2211 from apache/fix_changelog

Update changelog