Updated CHANGELOG & version code from release/6.0 branch

Merged Sylvain Berfini requested to merge fix/changelog into master

Merge request reports