imjournal: escape zero bytes in fields' values
Remove references to deleted files from Makefiles

These files were removed in commits dadec46 and 77ef11a.
Merge remote-tracking branch 'github/master'

There was no way around this merge (at least none that I know)
because it looks like this is needed to correct a rebase that
obviously wasn't right.