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

Conflicts:
	tools/syslogd.c

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	net.h
	plugins/imtcp/imtcp.c
	plugins/imudp/imudp.c
	runtime/net.c
	runtime/rsyslog.h
	tcps_sess.c
	tcpsrv.c

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

- added $InputTCPServerAddtlFrameDelimiter config directive, which
  enabeles to specify an additional, non-standard message delimiter
  for processing plain tcp syslog. This is primarily a fix for the invalid
  framing used in Juniper's NetScreen products. Credit to forum user
  Arv for suggesting this solution.
- added $InputTCPServerInputName property, which enables a name to be
  specified that will be available during message processing in the
  inputname property. This is considered useful for logic that treats
  messages differently depending on which input received them.

I commented out some debug code that is only useful in some
testing scenarios and re-enabled the old code. This solved a FreeBSD
compile issue. Also, I fixed some other syntax error, which somehow
went into the tree (I am still puzzled about that, especially as some
have already and successfully build from that tree... anyhow ;)).

Enables to use FQDNs in sender names where the legacy default