Merge pull request #715 in SNORT/snort3 from appid_fflow3 to master

Merge pull request #715 in SNORT/snort3 from appid_fflow3 to master

Squashed commit of the following:

commit a9e3e7de8612efb242df0f21d32d0654e647d90c
Merge: 31d0bf7 61a685b
Author: Steve Chew <stechew@cisco.com>
Date:   Mon Nov 21 23:50:53 2016 -0500

    Merge branch 'appid_fflow3' of ssh://bitbucket-eng-rtp1.cisco.com:7999/snort/snort3 into appid_fflow3

    Conflicts:
    	src/network_inspectors/appid/detector_plugins/detector_http.cc

commit 31d0bf78b51445976b335f705e25be0b0f744794
Author: Steve Chew <stechew@cisco.com>
Date:   Mon Nov 21 22:52:16 2016 -0500

    Remove future flow appid feature for http since there is no known use
    case.

commit 61a685bfd603fe098c64589162acbe2f838d2629
Author: Steve Chew <stechew@cisco.com>
Date:   Mon Nov 21 22:52:16 2016 -0500

    Remove future flow appid feature for http since there is no known use
    case.