Pg 3.1.x backport cleanup

The backporting of some hotfixes (`3.1.2`, `3.1.3` und `3.1.4`), weren't done all that cleanly.
Therefore some manuel cherry-picking adjustments are needed.

* Changelog
* Main dossier test rework (see PR closes #47 )

@lukasgraf please take a look (you already reviewed the dossier test rework see #192)