Merge branch 'master' of

https://bitbucket-eng-rtp1.cisco.com/bitbucket/scm/snort/snort3.git into
file_segment

Conflicts:
	src/file_api/file_flows.cc

diff --cc src/file_api/file_flows.cc
index dc17f47a256410eab5d520e7d2e333ad148e8d79,aa2edcf1850e032e5eb7274d611a8d9d098a8513..e58e109651d83dce98b07671a9a97649975b7c19
--- 1/src/file_api/file_flows.cc
--- 2/src/file_api/file_flows.cc
+++ b/src/file_api/file_flows.cc
@@@ -57,7 -54,7 +57,8 @@@ unsigned FileFlows::flow_id = 0
  
  FileFlows* FileFlows::get_file_flows(Flow* flow)
  {
 -    FileFlows* fd = (FileFlows*) flow->get_flow_data(FileFlows::flow_id);
++
 +    FileFlows* fd = (FileFlows*)flow->get_flow_data(FileFlows::flow_id);
  
      if (fd)
          return fd;