Next v2

https://github.com/inliniac/suricata/pull/1274, https://github.com/inliniac/suricata/pull/1262, IPS fixes from https://github.com/inliniac/suricata/pull/1278 (but not all of the PR)

Prscript:
- PR build: https://buildbot.openinfosecfoundation.org/builders/inliniac/builds/103
- PR pcaps: https://buildbot.openinfosecfoundation.org/builders/inliniac-pcap/builds/103