Merge branch 'jts/12-0-changelog-update' into '12-0-stable'
Updates changelog to reflect appropriate release versions See merge request gitlab/gitlabhq!3321
Updates changelog to reflect appropriate release versions See merge request gitlab/gitlabhq!3321