Merge pull request #627 in SNORT/snort3 from ~MIALTIZE/snort3:expected_flows to master

Merge pull request #627 in SNORT/snort3 from ~MIALTIZE/snort3:expected_flows to master

Squashed commit of the following:

commit 91133a83eca85bc05e403bce6973af2099e5159e
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Sep 26 16:36:45 2016 -0400

    file_mempool: Fix initializing total pool size

commit 61ae01ad22a6a4f4093c749304023b5a25045633
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Sep 26 13:40:23 2016 -0400

    expected: Push expected flow information through the DAQ module

commit 08aa5f9a79a724a61274854fcc37f05a0fc3d1da
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Sep 26 12:22:04 2016 -0400

    sfdaq: Add SFDAQInstance::add_expected() call

commit 218769cb579189f0600b53c7c6abde063d34627f
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Sep 26 13:34:57 2016 -0400

    expected: Expected cache revamp and related bugfixes

    - Change expected cache to use FlowKeys instead of ExpectKeys
    - Support expected flows where the full N-tuple is known
    - Fix SIP (ignored) expected flow creation logic
    - Fix AppID expected flow creation regarding IP proto/PktType
    - Add FTP data channel expected flow with type TCP rather than PDU
    - Many expected cache bugfixes

commit 686ff5e39c79b81472c794a18548e77146638348
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Sep 26 12:34:51 2016 -0400

    ftp_data: Add expected data consumption to set service name and fix bugs

    - Set the parent flow key type from the flow rather than the packet when
    creating FTP-DATA flow data.
    - Correctly retrieve FTP-DATA flow data instead of FTP flow data when
    inspecting with FTP-DATA.

commit 2931ce2677e0a4c20454430f361d92f65c99a2f5
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Sep 26 12:31:31 2016 -0400

    stream: Fix NPD in get_flow_data() when flow doesn't exist

commit b06e59efa081db48229bc098f89f1b906b993fd4
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Sep 26 12:27:15 2016 -0400

    flow_key: Add address/port reversal reporting to init()

commit 994b52c89ffedd64ee69395707227589c913be1b
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Sep 26 12:25:08 2016 -0400

    zhash: Add new node insertion reporting to get()

commit 60af08a53b8711d72aebbd8fc14690bbc493ddc5
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Sep 26 12:23:34 2016 -0400

    ftp: Fix marking file get commands

commit 90aaa06a5f47b28e8c4d48c522944c0204c6ac9e
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Sep 26 12:19:33 2016 -0400

    build: Remove lingering LibDAQ #ifdefs

commit 9c6f5d9e74d0a7a7deeb5dd702298c43b05ae2fd
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Sep 26 12:16:48 2016 -0400

    defaults: Update FTP default config based on Snort2's hardcoded one