Backports 20x v1

Backports to 2.0.x branch.

- https://buildbot.openinfosecfoundation.org/builders/inliniac/builds/44
- https://buildbot.openinfosecfoundation.org/builders/inliniac-pcap/builds/44