Next v2

PRs: https://github.com/inliniac/suricata/pull/877, https://github.com/inliniac/suricata/pull/876, https://github.com/inliniac/suricata/pull/874, https://github.com/inliniac/suricata/pull/873

Prscript:
- PR build: https://buildbot.suricata-ids.org/builders/inliniac/builds/222
- PR pcaps: https://buildbot.suricata-ids.org/builders/inliniac-pcap/builds/142