Next v1

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