Merge branch 'changelog-error' into 'master'

Fix lint-doc error

## What does this MR do?
Removes duplicate changelog versions to fix lint-doc error (https://gitlab.com/gitlab-org/gitlab-ce/builds/4621603)

See merge request !6623