Another around of debrebuild improvements

Fixes another 3 bugs/feature requests in debrebuild (the changelog lists one of them twice; both changes are needed for the bug to be fixed).

cc: @holger