pulling in latest from Russ

diff --cc extra/CMakeLists.txt
Simple merge

diff --cc extra/FindSnort.cmake
index c646a7467ddacb166fa3df31615fc81f69d51dc5,79288ca2f8b2f9605067ca39c4fd862012a4caf7..8a0cdffc3aaca0f8b50ff35897f43ce4e5d35f11
--- 1/extra/FindSnort.cmake
--- 2/extra/FindSnort.cmake
+++ b/extra/FindSnort.cmake
@@@ -1,25 -1,25 +1,4 @@@
--## Copyright (C) 2014 Cisco and/or its affiliates. All rights reserved.
--## This program is free software; you can redistribute it and/or modify
--## it under the terms of the GNU General Public License Version 2 as
--## published by the Free Software Foundation.  You may not use, modify or
--## distribute this program under any other version of the GNU General
--## Public License.
--##
--## This program is distributed in the hope that it will be useful,
--## but WITHOUT ANY WARRANTY; without even the implied warranty of
--## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--## GNU General Public License for more details.
--##
--## You should have received a copy of the GNU General Public License
--## along with this program; if not, write to the Free Software
--## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
--
--#
  #
--#  Locate DAQ library
--#  This module defines
--#  DAQ_FOUND, if false, do not try to link to Lua
--# 
  #  SNORT_FOUND - Found Snort
  #  SNORT_EXECUTABLE - The Snort++ executable
  #  SNORT_INCLUDE_DIR - Snort include directory

diff --cc src/codecs/ip/cd_routing.cc
index d15efd0aaf71a226f2ed12d26b42fd7aa5040f6a,d15efd0aaf71a226f2ed12d26b42fd7aa5040f6a..886d417853ad3a3908cfcee053f727c6e1d0398a
--- 1/src/codecs/ip/cd_routing.cc
--- 2/src/codecs/ip/cd_routing.cc
+++ b/src/codecs/ip/cd_routing.cc
@@@ -71,7 -71,7 +71,7 @@@ struct IP6Route
      uint8_t ip6rte0_seg_left;
      uint8_t ip6rte0_reserved;
      uint8_t ip6rte0_bitmap[3];
--    struct in6_addr ip6rte0_addr[1];  /* Up to 23 IP6 addresses */
++    struct snort_in6_addr ip6rte0_addr[1];  /* Up to 23 IP6 addresses */
  } ;
  #endif