Next 20x v2

PRs https://github.com/inliniac/suricata/pull/1248 https://github.com/inliniac/suricata/pull/1244 https://github.com/inliniac/suricata/pull/1240 https://github.com/inliniac/suricata/pull/1203

Prscript:
- PR build: https://buildbot.openinfosecfoundation.org/builders/inliniac/builds/84
- PR pcaps: https://buildbot.openinfosecfoundation.org/builders/inliniac-pcap/builds/84