Merge branch 'v7-stable' of git+ssh://git.adiscon.com/git/rsyslog into v7-stable
prepare for 7.6.4
Merge branch 'v7-stable' into v8-stable

Conflicts:
	ChangeLog
	configure.ac