milestone: tcp stream compression support for transaction boundaries
bugfix: stream compression in imptcp caused timestamp to be corrupted
Merge branch 'master' into master-zipflush

Conflicts:
	plugins/imptcp/imptcp.c
cleanup
Fixed return state handling in ConsumerDA

The queue full loop fix added a problem to the queue when
rsyslog was shutdown. This problem has been corrected now.

Conflicts:

	runtime/queue.c
add note on a potential future troublespot
Merge branch 'v7-stable'
refactor in preparation of local variables

local variables require a second json root; this refactoring makes
sure we can basically use common functions for json handling
milestone: basic local variable functionality available

but some nits, like do not work with disk queues
make local vars work together with disk queues
bugfix: CEE/json data was lost during disk queue operation
bugfix: memory leak if disk queues were used and json data present
cosmetic bugfix: file name buffer was not freed on disk queue destruction

This was an extremely small one-time per run memleak, so nothing of
concern. However, it bugs under valgrind and similar memory debuggers.
regression fix: %d used for long long types in debug output

regression from recent DA queue bug fix set of patches; not present
in any released code.
Merge branch 'v7-stable'
prepare for 7.4.3 release
Merge branch 'v7-stable'

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
bugfix: $QHOUR/$HHOUR were always "00" or "01"

regression some time between v5 and here
Thanks to forum user rjmcinty for reporting this bug
Merge branch 'v7-stable'
main_queue() config object added

doc still missing