Add JSON format DNS logging
Add JSON formatted alert output
change srcport->sp dstport->dp
fix NULL string into JSON in alert-json
Change JSON alert syslog level to INFO
Produce JSON formatted HTTP log to file or syslog
X-Forwarded-For
Add JSON HTTP log Content-Type
add smtp logging capability

Conflicts:

	src/suricata.c
cleanu
add SMTP attachment metadata
SMTP to: and attachments as JSON arrays
SMTP log Cc: support
tls log: add JSON output

This patch adds a new json option to tls logging. If set to yes, it
output TLS logging information in JSON format.
fix compile errors in original TLS JSON stuff
TLS logging using libjansson with syslog
Add broccoli output plugin

Conflicts:

	src/suricata.c
	src/tm-threads-common.h
align Broccoli ouput plugin with Barnyard2
add broccoli section to suricata.yaml

Conflicts:

	suricata.yaml.in
IPv6 support in Broccoli output plugin