chg: Renamed some variables to resolve some pep8 warnings @minor
chg: dev: Moved the base changelog reference for the tests.

Extracted the changelog used to compare to the test results for base
cases and moved it into its own file. This makes both the test and
the changelog easier to read. It also facilitates a standard way to
store other reference changelogs.
Merge branch 'feature/git-flow-support' into develop
Merge branch 'feature/git-flow-support' into develop
fix: Don't just look at branch merges because other things can be merged