Dev stream updates v1.4

Fix small QA issue in https://github.com/inliniac/suricata/pull/938

Prscript:
- PR build: https://buildbot.suricata-ids.org/builders/inliniac/builds/268
- PR pcaps: https://buildbot.suricata-ids.org/builders/inliniac-pcap/builds/187