Next 2.0.3 v1

Backports of various fixes.

Prscript:
- https://buildbot.openinfosecfoundation.org/builders/inliniac/builds/5
- https://buildbot.openinfosecfoundation.org/builders/inliniac-pcap/builds/5