Update Changelog with entries from related projects.
Merge branch 'refs/heads/master' into 2.2.x-legacy