Add missing "leaks" group to a test.
Updates for the dns-zero-responses-fix branch.
Update baselines for added SSL client cert fields.
Merge remote-tracking branch 'origin/topic/seth/dns-zero-responses-fix'

* origin/topic/seth/dns-zero-responses-fix:
  Updates for the dns-zero-responses-fix branch.
Merge remote-tracking branch 'origin/topic/jsiwek/gridftp'

* origin/topic/jsiwek/gridftp:
  Update baselines for added SSL client cert fields.
Baseline update for DNS fix.
Baseline updates for HTTP changes.
Updates for the topic/seth/notice-framework-updates branch tests.
Fix trace download urls.
Updating baselines for software version updates.
Merge remote-tracking branch 'origin/topic/seth/software-version-updates2'

* origin/topic/seth/software-version-updates2:
  Updating baselines for software version updates.
FileAnalysis: update baselines.

(Yes, I spent a day checking over the diffs.)

The only interesting thing to note that I can remember is that there
was the old baseline may have had MD5's calculated for HTTP
partial content, but it's not anymore becase the FAF isn't yet
attempting to do any reassembly of non-linear file transfers.
(And the old way of always generating hashes for partial content
would be wrong in a lot of cases).
FileAnalysis: baseline updates.
FileAnalysis: baseline update for new libmagic database.
Updates for the metrics-merge branch (SumStats framework).

 - The tests are still failing due to some issue in conn.log where
   incomplete connection seem to be tracked differently than they were.

 - FTP updates because path handling is done better now that it was before.
FileAnalysis: baseline update for is_orig field.
Merge remote-tracking branch 'origin/topic/seth/metrics-merge'

* origin/topic/seth/metrics-merge:
  Updates for the metrics-merge branch (SumStats framework).
Updating baselines.

Turns out loading the new scan.bro changes the semantics of TCP
connections that are attempted but never established: scan.bro defines
a connection_attempt() handler, which we don't use in any other
script. However, if that's defined, the TCP analyzer installs an
additional timer that times out the connection more quickly. That's
why in the tests some connections with multiple SYNs but nothing else,
suddenly show as multiple log entries rather than one.
Merge remote-tracking branch 'origin/master' into topic/jsiwek/file-analysis

Note I haven't actually checked the baselines.

Conflicts:
	Baseline/tests.ipv6/ftp.log
	Baseline/tests.m57-long/notice.log
	Baseline/tests.m57-short/notice.log
Revert "Merge remote-tracking branch 'origin/master' into topic/jsiwek/file-analysis"

This reverts commit 1480acbe819b11dfc0dfcb0b00444ff6bb9d99a5, reversing
changes made to 799f3096c0e865a908dc8e6a049d87445dd7eb91.