Bug 1288 20x v0

Backport/cherry-pick of https://github.com/inliniac/suricata/pull/1138

Prscript:
- https://buildbot.openinfosecfoundation.org/builders/inliniac/builds/32
- https://buildbot.openinfosecfoundation.org/builders/inliniac-pcap/builds/32