Update changelog for release 3.6 See merge request !3303
mentioned in commit 4e8d10ee
mentioned in commit 68cd5916