Conflicts:

	ChangeLog
	doc/manual.html
	doc/rsyslog_conf.html
	omfwd.c

New syntax @[addr]:port introduced to enable that. Root problem was IPv6
addresses contain colons. (backport from 3.21.3)

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>

Update the documentation to use the new, preferred $ModLoad syntax:
- no more MySQL
- name of the in/output plugin without the trailing .so

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>

- Update the version number and date in the man pages
- s/imklogd/imklog/

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>

- added a new property replacer option "sp-if-no-1st-sp" to cover
  a problem with RFC 3164 based interpreation of tag separation. While
  it is a generic approach, it fixes a format problem introduced in
  3.18.0, where kernel messages no longer had a space after the tag.
  This is done by a modifcation of the default templates.
  Please note that this may affect some messages where there intentionally
  is no space between the tag and the first character of the message
  content. If so, this needs to be worked around via a specific
  template. However, we consider this scenario to be quite remote and,
  even if it exists, it is not expected that it will actually cause
  problems with log parsers (instead, we assume the new default template
  behaviour may fix previous problems with log parsers due to the
  missing space).
- doc bugfix: property replacer options secpath-replace and
  secpath-drop were not documented