Merge branch 'rs-simplify-changelog-branch_name' into 'master'

Simplify `branch_name` in bin/changelog

The `--short` option has existed since at least 1.8.1:
https://git-scm.com/docs/git-symbolic-ref/1.8.1

See merge request !7891