Merge branch 'master' into openbsd_integration

diff --cc test/conf/default_psad.conf
Simple merge

diff --cc test/conf/disable_ipv6_detection.conf
Simple merge

diff --cc test/conf/enable_ack_detection.conf
Simple merge

diff --cc test/conf/ignore_tcp.conf
Simple merge

diff --cc test/conf/ignore_udp.conf
Simple merge

diff --cc test/conf/require_DROP_syslog_prefix_str.conf
Simple merge

diff --cc test/conf/require_missing_syslog_prefix_str.conf
Simple merge