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

testing/btest/scripts/base/frameworks/analyzer/disable-analyzer.zeek

@@ -7,7 +7,6 @@
 @load base/protocols/conn
 @load base/protocols/dns
 @load base/protocols/ssh
-@load base/frameworks/dpd
 
 redef Analyzer::disabled_analyzers += { Analyzer::ANALYZER_SSH };
 

testing/btest/scripts/base/frameworks/config/container-options.zeek

@@ -2,7 +2,6 @@
 # @TEST-EXEC: btest-diff out
 
 @load base/frameworks/config
-@load base/frameworks/dpd
 
 type Color: enum { RED, GREEN, BLUE };
 

testing/btest/scripts/base/frameworks/input/config/enum-set.zeek

@@ -8,7 +8,6 @@ DPD::ignore_violations Analyzer::ANALYZER_SYSLOG
 @TEST-END-FILE
 
 @load base/frameworks/config
-@load base/frameworks/dpd
 
 redef exit_only_after_terminate = T;
 redef InputConfig::empty_field = "EMPTY";

testing/btest/scripts/base/frameworks/logging/sqlite/wikipedia.zeek

@@ -12,4 +12,3 @@
 @load base/protocols/http
 @load base/protocols/dns
 @load base/protocols/conn
-@load base/frameworks/dpd

testing/btest/scripts/base/frameworks/netcontrol/packetfilter.zeek

@@ -4,7 +4,6 @@
 @load base/protocols/conn
 @load base/protocols/smtp
 @load base/protocols/dns
-@load base/frameworks/dpd
 @load base/frameworks/netcontrol
 
 event NetControl::init()