bugfix: mmjsonparse did not build with json-c < 0.10

This was a regression introduced some time in the past in order to
support API changes in json-c. Now we check for the version and use
proper code.

Conflicts:

	ChangeLog
imuxsock: initialize system socket params only once

The system socket parameters were initialized twice and most of the
values set at first were overwritten. All the assignments are now
moved to activateListeners(). The parameters aren't accessed before
then.
imuxsock: initialize the system socket only if it's in use
imuxsock: don't try to set up sockets if there are none configured

This should be the correct version of this commit:
commit 6138ced6ce4abbaccf4c45f7b69a14811feb96ad
imuxsock: don't report an error message for $OmitLocalLogging

And in effect reverts this commit:
commit d77a8b1b8877d2dd1a0248b07564d1f88be00deb
imuxsock: When syssock.use set to off, additional listeners cannot be created
nitfix: adjust debug log message to new code path
Merge branch 'v7-stable' of git+ssh://git.adiscon.com/git/rsyslog into v7-stable
bugfix: mmanon did not properly anonymize IP addresses starting with '9'

Thanks to defa-at-so36.net for reporting this problem.
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=529
bugfix: imfile: if a state file for a different file name was set,

that different file (name) was monitored instead of the configured
one. Now, the state file is deleted and the correct file monitored.

closes: https://github.com/rsyslog/rsyslog/issues/103
prepare for 7.6.4
define a macro missing on some very few platforms
Merge branch 'v7-stable' of git+ssh://git.adiscon.com/git/rsyslog into v7-stable
fix build problem on platforms without atomic instructions

Thanks to Michael Biebl for his very helpful analysis of the bug.
do not accept out of bounds PRI values

further reference: CVE-2014-3634
add invld.* selector, fix problem with previous patch
Merge branch 'v5.8.6-prifix' into v5.8.13-prifix
bugfix: improper handling of invalid PRI values

references: CVE-2014-3634
Merge branch 'v3-stable-prifix' into tmp

Conflicts:
	action.c
	runtime/rsyslog.h
fix compile problems and cleanup

most importantly, we do no longer use the LOG_FAC() and LOG_PRI() macro
names, which may conflict with systems names and may act other than
expected by a user.
fix wrong patch

comment was unended, was pure accident it compiled...
Merge branch 'v3-stable-prifix' into tmp

Conflicts:
	runtime/rsyslog.h