More updates
Merge branch 'master' into crs_cmake
More stage changes
Remove windows specific files
More cleanups
Fix bad pcap opt
More fixups
More cmake