diff --git a/staging/etc/logstash/conf.d/1105_preprocess_bro_ftp.conf b/staging/etc/logstash/conf.d/1105_preprocess_bro_ftp.conf
diff --git a/staging/etc/logstash/conf.d/1106_preprocess_bro_http.conf b/staging/etc/logstash/conf.d/1106_preprocess_bro_http.conf
diff --git a/staging/etc/logstash/conf.d/1107_preprocess_bro_irc.conf b/staging/etc/logstash/conf.d/1107_preprocess_bro_irc.conf
diff --git a/staging/etc/logstash/conf.d/1108_preprocess_bro_kerberos.conf b/staging/etc/logstash/conf.d/1108_preprocess_bro_kerberos.conf
diff --git a/staging/etc/logstash/conf.d/1109_preprocess_bro_notice.conf b/staging/etc/logstash/conf.d/1109_preprocess_bro_notice.conf
diff --git a/staging/etc/logstash/conf.d/1110_preprocess_bro_rdp.conf b/staging/etc/logstash/conf.d/1110_preprocess_bro_rdp.conf
diff --git a/staging/etc/logstash/conf.d/1111_preprocess_bro_signatures.conf b/staging/etc/logstash/conf.d/1111_preprocess_bro_signatures.conf
diff --git a/staging/etc/logstash/conf.d/1112_preprocess_bro_smtp.conf b/staging/etc/logstash/conf.d/1112_preprocess_bro_smtp.conf
diff --git a/staging/etc/logstash/conf.d/1113_preprocess_bro_snmp.conf b/staging/etc/logstash/conf.d/1113_preprocess_bro_snmp.conf
diff --git a/staging/etc/logstash/conf.d/1114_preprocess_bro_software.conf b/staging/etc/logstash/conf.d/1114_preprocess_bro_software.conf
diff --git a/staging/etc/logstash/conf.d/1115_preprocess_bro_ssh.conf b/staging/etc/logstash/conf.d/1115_preprocess_bro_ssh.conf
diff --git a/staging/etc/logstash/conf.d/1116_preprocess_bro_ssl.conf b/staging/etc/logstash/conf.d/1116_preprocess_bro_ssl.conf
diff --git a/staging/etc/logstash/conf.d/1117_preprocess_bro_syslog.conf b/staging/etc/logstash/conf.d/1117_preprocess_bro_syslog.conf
diff --git a/staging/etc/logstash/conf.d/1118_preprocess_bro_tunnel.conf b/staging/etc/logstash/conf.d/1118_preprocess_bro_tunnel.conf
diff --git a/staging/etc/logstash/conf.d/1119_preprocess_bro_weird.conf b/staging/etc/logstash/conf.d/1119_preprocess_bro_weird.conf
diff --git a/staging/etc/logstash/conf.d/1121_preprocess_bro_mysql.conf b/staging/etc/logstash/conf.d/1121_preprocess_bro_mysql.conf
diff --git a/staging/etc/logstash/conf.d/1122_preprocess_bro_socks.conf b/staging/etc/logstash/conf.d/1122_preprocess_bro_socks.conf
diff --git a/staging/etc/logstash/conf.d/1123_preprocess_bro_x509.conf b/staging/etc/logstash/conf.d/1123_preprocess_bro_x509.conf
diff --git a/staging/etc/logstash/conf.d/1124_preprocess_bro_intel.conf b/staging/etc/logstash/conf.d/1124_preprocess_bro_intel.conf
diff --git a/staging/etc/logstash/conf.d/1125_preprocess_bro_modbus.conf b/staging/etc/logstash/conf.d/1125_preprocess_bro_modbus.conf
diff --git a/staging/etc/logstash/conf.d/1126_preprocess_bro_sip.conf b/staging/etc/logstash/conf.d/1126_preprocess_bro_sip.conf
diff --git a/staging/etc/logstash/conf.d/1127_preprocess_bro_radius.conf b/staging/etc/logstash/conf.d/1127_preprocess_bro_radius.conf
diff --git a/staging/etc/logstash/conf.d/1128_preprocess_bro_pe.conf b/staging/etc/logstash/conf.d/1128_preprocess_bro_pe.conf
diff --git a/staging/etc/logstash/conf.d/1129_preprocess_bro_rfb.conf b/staging/etc/logstash/conf.d/1129_preprocess_bro_rfb.conf
diff --git a/staging/etc/logstash/conf.d/1130_preprocess_bro_dnp3.conf b/staging/etc/logstash/conf.d/1130_preprocess_bro_dnp3.conf
diff --git a/staging/etc/logstash/conf.d/1131_preprocess_bro_smb_files.conf b/staging/etc/logstash/conf.d/1131_preprocess_bro_smb_files.conf
diff --git a/staging/etc/logstash/conf.d/1132_preprocess_bro_smb_mapping.conf b/staging/etc/logstash/conf.d/1132_preprocess_bro_smb_mapping.conf
diff --git a/staging/etc/logstash/conf.d/1133_preprocess_bro_ntlm.conf b/staging/etc/logstash/conf.d/1133_preprocess_bro_ntlm.conf
diff --git a/staging/etc/logstash/conf.d/1134_preprocess_bro_dce_rpc.conf b/staging/etc/logstash/conf.d/1134_preprocess_bro_dce_rpc.conf
diff --git a/staging/etc/logstash/conf.d/6000_bro.conf b/staging/etc/logstash/conf.d/6000_bro.conf
diff --git a/staging/etc/logstash/conf.d/6001_bro_import.conf b/staging/etc/logstash/conf.d/6001_bro_import.conf
diff --git a/staging/etc/logstash/conf.d/8000_postprocess_bro_cleanup.conf b/staging/etc/logstash/conf.d/8000_postprocess_bro_cleanup.conf
diff --git a/staging/etc/logstash/conf.d/8001_postprocess_common_ip_augmentation.conf b/staging/etc/logstash/conf.d/8001_postprocess_common_ip_augmentation.conf
diff --git a/staging/etc/logstash/conf.d/8006_postprocess_dns.conf b/staging/etc/logstash/conf.d/8006_postprocess_dns.conf
diff --git a/staging/etc/logstash/conf.d/8007_postprocess_dns_top1m_tagging.conf b/staging/etc/logstash/conf.d/8007_postprocess_dns_top1m_tagging.conf
diff --git a/staging/etc/logstash/conf.d/8007_postprocess_http.conf b/staging/etc/logstash/conf.d/8007_postprocess_http.conf
diff --git a/staging/etc/logstash/conf.d/8008_postprocess_dns_whois_age.conf b/staging/etc/logstash/conf.d/8008_postprocess_dns_whois_age.conf
diff --git a/staging/etc/logstash/conf.d/8200_postprocess_tagging.conf b/staging/etc/logstash/conf.d/8200_postprocess_tagging.conf
diff --git a/staging/etc/logstash/conf.d/8502_postprocess_freq_analysis_bro_dns.conf b/staging/etc/logstash/conf.d/8502_postprocess_freq_analysis_bro_dns.conf
diff --git a/staging/etc/logstash/conf.d/8503_postprocess_freq_analysis_bro_http.conf b/staging/etc/logstash/conf.d/8503_postprocess_freq_analysis_bro_http.conf
diff --git a/staging/etc/logstash/conf.d/8504_postprocess_freq_analysis_bro_ssl.conf b/staging/etc/logstash/conf.d/8504_postprocess_freq_analysis_bro_ssl.conf
diff --git a/staging/etc/logstash/conf.d/8505_postprocess_freq_analysis_bro_x509.conf b/staging/etc/logstash/conf.d/8505_postprocess_freq_analysis_bro_x509.conf
diff --git a/staging/etc/logstash/conf.d/8998_postprocess_log_elapsed.conf b/staging/etc/logstash/conf.d/8998_postprocess_log_elapsed.conf
diff --git a/staging/etc/logstash/conf.d/8999_postprocess_rename_type.conf b/staging/etc/logstash/conf.d/8999_postprocess_rename_type.conf
diff --git a/staging/etc/logstash/conf.d/9000_output_bro.conf b/staging/etc/logstash/conf.d/9000_output_bro.conf
diff --git a/staging/etc/logstash/logstash-template.json b/staging/etc/logstash/logstash-template.json
diff --git a/staging/etc/syslog-ng/syslog-ng.conf b/staging/etc/syslog-ng/syslog-ng.conf
diff --git a/staging/etc/systemd/system/bro.service b/staging/etc/systemd/system/bro.service
diff --git a/staging/usr/share/bro/json-logs/__load__.bro b/staging/usr/share/bro/json-logs/__load__.bro
diff --git a/staging/usr/share/bro/securityonion/__load__.bro b/staging/usr/share/bro/securityonion/__load__.bro
diff --git a/staging/usr/share/bro/securityonion/add-interface-to-logs.bro b/staging/usr/share/bro/securityonion/add-interface-to-logs.bro
diff --git a/staging/usr/share/bro/securityonion/bpfconf.bro b/staging/usr/share/bro/securityonion/bpfconf.bro
diff --git a/staging/usr/share/bro/securityonion/config-bro.bro b/staging/usr/share/bro/securityonion/config-bro.bro
diff --git a/staging/usr/share/bro/securityonion/conn-add-country.bro b/staging/usr/share/bro/securityonion/conn-add-country.bro
diff --git a/staging/usr/share/bro/securityonion/conn-add-sensorname.bro b/staging/usr/share/bro/securityonion/conn-add-sensorname.bro
diff --git a/staging/usr/share/bro/securityonion/hostname.bro b/staging/usr/share/bro/securityonion/hostname.bro
diff --git a/staging/usr/share/bro/securityonion/interface.bro b/staging/usr/share/bro/securityonion/interface.bro
diff --git a/staging/usr/share/bro/securityonion/load-non-default-scripts.bro b/staging/usr/share/bro/securityonion/load-non-default-scripts.bro
diff --git a/staging/usr/share/bro/securityonion/readfile.bro b/staging/usr/share/bro/securityonion/readfile.bro
diff --git a/staging/usr/share/bro/securityonion/sensortab.bro b/staging/usr/share/bro/securityonion/sensortab.bro
diff --git a/staging/usr/share/bro/sguild_bro/TCPUDPFlow.bro b/staging/usr/share/bro/sguild_bro/TCPUDPFlow.bro
diff --git a/staging/usr/share/bro/shellshock/COPYING b/staging/usr/share/bro/shellshock/COPYING
diff --git a/staging/usr/share/bro/shellshock/README.md b/staging/usr/share/bro/shellshock/README.md
diff --git a/staging/usr/share/bro/shellshock/__load__.bro b/staging/usr/share/bro/shellshock/__load__.bro
diff --git a/staging/usr/share/bro/shellshock/file-mimetypes.sig b/staging/usr/share/bro/shellshock/file-mimetypes.sig
diff --git a/staging/usr/share/bro/shellshock/main.bro b/staging/usr/share/bro/shellshock/main.bro
diff --git a/staging/usr/share/bro/shellshock/shellshock-http.sig b/staging/usr/share/bro/shellshock/shellshock-http.sig
diff --git a/staging/var/spool/bro/broctl-config.sh b/staging/var/spool/bro/broctl-config.sh