Next v1

PRs: https://github.com/inliniac/suricata/pull/1182 https://github.com/inliniac/suricata/pull/1175 https://github.com/inliniac/suricata/pull/1181 https://github.com/inliniac/suricata/pull/1177 https://github.com/inliniac/suricata/pull/1178

Prscript:
- PR build: https://buildbot.openinfosecfoundation.org/builders/inliniac/builds/41
- PR pcaps: https://buildbot.openinfosecfoundation.org/builders/inliniac-pcap/builds/41