TCP update, general fixes

PR's: https://github.com/inliniac/suricata/pull/1173 https://github.com/inliniac/suricata/pull/1162
Plus another TCP stream fix.

Prscript:
- PR build: https://buildbot.openinfosecfoundation.org/builders/inliniac/builds/38                                
- PR pcaps: https://buildbot.openinfosecfoundation.org/builders/inliniac-pcap/builds/38