Merge branch 'update/changelog-3.6' into 'master'

Update changelog for release 3.6

See merge request !3303

(cherry picked from commit 48600841)

424ec1c9 Update changelog for release 3.6
6 jobs for !3309 with cherry-pick-48600841 in 1 minute and 9 seconds (queued for 3 seconds)
latest merge request