changelog and partial reversion of #87

This pull request made two changes. This commit reverts one of them to make the
changes orthogonal.
both release and release group disambig (#87)

This joins the two strings with a comma if both are present.