Dev stream cleanup v1.4

Rebase of https://github.com/inliniac/suricata/pull/729

prscript:
https://buildbot.suricata-ids.org/builders/inliniac/builds/119
https://buildbot.suricata-ids.org/builders/inliniac-pcap/builds/40 (1 fail expected)