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.
testbench: add tests for "set" statement
bugfix: imudp makes rsyslog hang on shutdown when more than 1 thread used

closes https://github.com/rsyslog/rsyslog/issues/126
testbench: add test for potential imudp hang
imjournal: make $IgnorePreviousMessages take effect even without a state file

Previously, $StateFile had to be specified for $IgnorePreviousMessages
to work.
Correct and slightly extend the man page section on debugging
Amend the rsyslog.conf man page with the file sync syntax
bugfix: testbench failed if imptcp was not enabled
tests: imdiag dependency is implied by testbench
Merge pull request #163 from rsyslog/master-th-tests-cleanup

Two small changes to tests
imjournal: add a new option UsePIDFromSystem

This option is analogous to the option of the same name from imuxsock.
When set, the PID is taken from the journal rather than the message.

Conflicts:
	plugins/imjournal/imjournal.c
fix datatype conversion
imjournal: remove redundant condition