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.
Merge branch 'v7-stable' into v8-stable
Merge branch 'v8-stable'