bugfix: abort if "if $syslogfacility-text..." was being used
doc: update ChangeLog
prepare for 7.4.6 release
Merge branch 'v7-stable'

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
doc: update ChangeLog
Merge branch 'master' into master-ruleeng