Bug 861168: Fix regression in l10n_merge command.

@pascalchevrel Try this branch to fix the merge issue. I need to add
some tests before this is ready to merge, but I believe this will
indeed fix it.