Merge remote-tracking branch 'origin/topic/awelzel/dpd-analyzer-merger'

* origin/topic/awelzel/dpd-analyzer-merger:
  analyzer/dpd: Address review comments
  Remove @load base/frameworks/dpd from tests
  frameworks/dpd: Move to frameworks/analyzer/dpd, load by default
  scripts/dce-rpc,ntlm: Do not load base/frameworks/dpd
  btest: Remove unnecessary loading of frameworks/dpd

scripts/base/frameworks/analyzer/__load__.zeek

@@ -1 +1,2 @@
 @load ./main
+@load ./dpd

scripts/base/frameworks/dpd/README

@@ -1,2 +0,0 @@
-The DPD (dynamic protocol detection) activates port-independent protocol
-detection and selectively disables analyzers if protocol violations occur.

scripts/base/frameworks/dpd/__load__.zeek

@@ -1 +1,3 @@
-@load ./main
+@deprecated "Remove in v6.1 - now loaded automatically";
+
+@load base/frameworks/analyzer

scripts/base/init-default.zeek

@@ -30,7 +30,6 @@
 #@load base/frameworks/logging
 @load base/frameworks/notice
 @load base/frameworks/analyzer
-@load base/frameworks/dpd
 @load base/frameworks/signatures
 @load base/frameworks/packet-filter
 @load base/frameworks/software

scripts/base/protocols/dce-rpc/main.zeek

@@ -1,5 +1,4 @@
 @load ./consts
-@load base/frameworks/dpd
 @load base/protocols/conn/removal-hooks
 
 module DCE_RPC;

scripts/base/protocols/ntlm/main.zeek

@@ -1,4 +1,3 @@
-@load base/frameworks/dpd
 @load base/protocols/conn/removal-hooks
 
 module NTLM;

scripts/policy/frameworks/dpd/packet-segment-logging.zeek

@@ -4,8 +4,6 @@
 ##! A caveat to logging packet data is that in some cases, the packet may
 ##! not be the packet that actually caused the protocol violation.
 
-@load base/frameworks/dpd
-
 module DPD;
 
 export {