stream updates v1.5

Rebase of https://github.com/inliniac/suricata/pull/939

Prscript:
- PR build: https://buildbot.suricata-ids.org/builders/inliniac/builds/272
- PR pcaps: https://buildbot.suricata-ids.org/builders/inliniac-pcap/builds/191