codec updates from josh

diff --cc src/main/snort.cc
Simple merge

diff --cc src/network_inspectors/port_scan/port_scan.cc
Simple merge

diff --cc src/stream/ip/ip_defrag.cc
Simple merge

diff --cc src/stream/tcp/tcp_session.cc
Simple merge