[backend] special support to merge SUSE style .changes files

This solves the problem of merge errors when upstream and branch apply changes at the
same time.

A (so far wanted) side effect is that times get converted to UTC times