add a changelog entry for cherry-picked commits