More fixes for changelog_gen

Change-Id: I568aefdacfbfd5965c723500047226408348b5b3