Updated CHANGELOG & version code from release/6.0 branch

Merged Sylvain Berfini requested to merge fix/update_changelog_and_version_code into master

Merge request reports