JSON output cleanup
Add "united" log to suricata.yaml.in