move the merging-code for location-/ sections to the end of all possible location-blocks; fixes #1193

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>