Adding the unified2 analyzer.

- This isn't connected to anything yet.
Merge remote-tracking branch 'origin/master' into topic/seth/unified2-analyzer

Conflicts:
	src/CMakeLists.txt
Unified2 file analyzer updated to new plugin style.
Merge remote-tracking branch 'origin/master' into topic/seth/unified2-analyzer
Working unified2 analyzer.

 - No output by default yet.  Most of the activity is centered
   around generating the Unified2::alert event which ties together
   an IDSEvent and a packet.
Fixed some tests.
Finished work on unified2 analyzer.
Fixes in case a packet isn't seen that matches an event.
Merge remote-tracking branch 'origin/topic/seth/unified2-analyzer'

BIT-1054 #merged

* origin/topic/seth/unified2-analyzer:
  Fixes in case a packet isn't seen that matches an event.
  Finished work on unified2 analyzer.
  Fixed some tests.
  Working unified2 analyzer.
  Unified2 file analyzer updated to new plugin style.
  Adding the unified2 analyzer.

Conflicts:
	testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
	testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
Merge remote-tracking branch 'origin/master' into topic/seth/unified2-analyzer

Conflicts:
	testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
	testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
Fixed a problem where the Unified2 analyzer was attached to every file.
Fix timer type enum and timer name array mismatch.
Merge remote-tracking branch 'origin/topic/seth/unified2-analyzer' into topic/robin/unified2-analyzer-merge

* origin/topic/seth/unified2-analyzer:
  Fixed a problem where the Unified2 analyzer was attached to every file.
  Fixing intel framework tests.
  Updating submodule(s).
  Add file name support to intel framework.
  Add file support to intel framework and slightly restructure intel http handling.

Conflicts:
	CHANGES
	VERSION
	scripts/base/files/unified2/main.bro
	testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
	testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
Merge branch 'topic/robin/unified2-analyzer-merge'

* topic/robin/unified2-analyzer-merge:
  Fixed a problem where the Unified2 analyzer was attached to every file.
  Fixes in case a packet isn't seen that matches an event.
  Finished work on unified2 analyzer.
  Fixed some tests.
  Working unified2 analyzer.
  Unified2 file analyzer updated to new plugin style.
  Adding the unified2 analyzer.
Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  Fix timer type enum and timer name array mismatch.