Merge branch 'master' into v8-stable

Conflicts:
	source/conf.py

fix formatting errors

Merge pull request rsyslog#102 from jgerhards/master

fixed formatting

Merge branch 'v8-stable'

bugfix: ommail supports RainerScript parameters only in v8.5.0+

backport release build script

Merge branch 'v7-stable' into v8-stable

Merge branch 'v5-stable' into v7-stable

fix inconsistent template definitions

The problem is in examples for FileFormat and ForwardFormat.  The
legacy templates show no space between syslogtag and
%msg:::sp-if-no-1st-sp%, but the new templates have a space.  Also,
the new ForwardFormat is missing a last msg property.  Here is my
patch to fix this assuming the legacy format correct.

prepare for 8.4.0 release