Merge pull request #495 in SNORT/snort3 from ha-sc to master

Merge pull request #495 in SNORT/snort3 from ha-sc to master

Squashed commit of the following:

commit 430c1bd63459e8d2815c0d532af12278d865a07a
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Mon Jun 6 11:34:27 2016 -0400

    Added stub for snort_strdup()

commit b0d605d273a4444c22a681aa675a31ef39bc09c4
Merge: 43a60e0 6641e05
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Mon Jun 6 11:16:13 2016 -0400

    Merge branch 'ha-sc' of https://bitbucket-eng-rtp1.cisco.com/bitbucket/scm/snort/snort3 into ha-sc

commit 6641e058727b4dad60b7e7fb476868df3dfb4f3a
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Tue May 31 15:12:25 2016 -0400

    Fix problem with udp_ha.

commit d58771e037cc54905f5244534d3c0f0d1c3fddb9
Merge: 518749e dc34515
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Thu May 26 07:47:39 2016 -0400

    Merge branch 'ha-sc' of https://bitbucket-eng-rtp1.cisco.com/bitbucket/scm/snort/snort3 into ha-sc

commit 518749e07afe7a3532c223c70faa5001f024cc24
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Wed May 25 16:21:55 2016 -0400

    Additional HA UT's and additional stream HA capabiity.

commit dc3451510b5d261c1188a7d57f98b42c18ddd20b
Merge: 022b844 5e0a5bb
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Wed May 25 16:23:59 2016 -0400

    Merge branch 'ha-sc' of https://bitbucket-eng-rtp1.cisco.com/bitbucket/scm/snort/snort3 into ha-sc

    Conflicts:
    	src/flow/ha.cc

commit 022b8440807ae03c857307e1ce252253a7e4d45b
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Wed May 25 16:21:55 2016 -0400

    Additional HA UT's and additional stream HA capabiity.

commit 5e0a5bb14097eb2a3d1ab4e53c7335585afb1699
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Thu May 19 10:36:05 2016 -0400

    Fix a memory leak in the Flow object regarding the ha_state.

commit 02bc6738393e253473f57c6b1367e0fd982ac033
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Wed May 18 09:15:29 2016 -0400

    Fix mem leak issue in UT.

commit d44d4c3631b90a7a136810ac137033d8fe72115e
Merge: 9a643a8 b2f8cf7
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Wed May 18 07:57:29 2016 -0400

    Merge branch 'ha-sc' of https://bitbucket-eng-rtp1.cisco.com/bitbucket/scm/snort/snort3

commit b2f8cf7996253e13761d0ec773400a41e14c4b47
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Tue May 17 15:02:59 2016 -0400

    A few small code review fixes.

commit b903d32fe80c4a4f19e80145a420696716cdd535
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Fri May 6 10:07:21 2016 -0400

    Fix a compile warning.

commit bfbd5abccc7a79b3283430a3307ae3402517953d
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Fri May 6 09:28:29 2016 -0400

    Forgot to add the file_connector_module_test to cmake

commit a99fb124eeae1e6d52f40a6217cbe61f4ada4a00
Merge: 08612c6 fe16e75
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Thu May 5 14:10:32 2016 -0400

    Merge branch 'ha-sc' of https://bitbucket-eng-rtp1.cisco.com/bitbucket/scm/snort/snort3 into ha-sc

commit 08612c66de9c1750015fcbd1033661931bcda05e
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Thu May 5 14:08:35 2016 -0400

    UT's for file_connector.

commit 2c5d4c13e44a644572e012e593e72ebe3d2b2b59
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Wed May 4 10:07:52 2016 -0400

    Fixed test stubs to eliminate memory leaks.

commit cc50492ed3d0f1ef5ded6ffcf3bedc238f7e9e4b
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Tue May 3 15:06:02 2016 -0400

    Makefile.am cosmetic changes.

commit 03ff7b57fde7dd0ac747ed2f04707aefed0e6da9
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Tue May 3 13:00:14 2016 -0400

    Remove extraneous stuff.

commit 6b73c2c7ec76339f974875a6aa0f41825f70ea5d
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Tue May 3 10:53:29 2016 -0400

    Additional UT's for side_channel.

commit fe16e7515225e59e75c6a975262d99260a1235b1
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Wed May 4 10:07:52 2016 -0400

    Fixed test stubs to eliminate memory leaks.

commit 67dec135d68701f4e12e4eeb94a6b8d86ac85afb
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Tue May 3 15:06:02 2016 -0400

    Makefile.am cosmetic changes.

commit b83d121adaed4f6118b14319f6ce2d0dfc46d4f6
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Tue May 3 13:00:14 2016 -0400

    Remove extraneous stuff.

commit 0f903af76892e136b3a86ff538f8bbd5858ba0a6
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Tue May 3 10:53:29 2016 -0400

    Additional UT's for side_channel.