Do not double escape json control chars
bugfix: CMP_LE expression eval worked incorrectly for JSON/String comparisons
Merge branch 'v7-stable' into v7-devel
Merge branch 'v7-devel'

Conflicts:
	grammar/rainerscript.c
bugfix: potential double-free in RainerScript equal comparison

happens if the left-hand operand is JSON object and the right-hand
operand is a non-string that does not convert to a number (for
example, it can be another JSON object, probably the only case that
could happen in practice). This is very unlikely to be triggered.
fix double free (introduced this morning)
fix double free (introduced this morning)
Merge branch 'v7-stable' into v7-devel

Conflicts:
	ChangeLog
testbench: add new test
bugfix: RainerScript >= did not work correctly with JSON variables
bugfix: RainerScript < did not work correctly with JSON variables
bugfix: RainerScript > did not work correctly with JSON variables
bugfix: RainerScript != did not work correctly with JSON variables
testbench: add test for RainerScript == operation
Merge branch 'v7-stable' into v7-devel
Merge branch 'v7-devel'

Conflicts:
	tests/Makefile.am
Don't link rsyslogd with libee

The library isn't referenced from the main application,
only from mmnormalize.
Merge branch 'v7-stable' into v7-devel
bugfix: invert the logic for issuing a warning
Merge branch 'v7-stable' into v7-devel