Next v2

PRs:
- https://github.com/inliniac/suricata/pull/1222
- https://github.com/inliniac/suricata/pull/1221
- https://github.com/inliniac/suricata/pull/1228

Prscript:
- PR build: https://buildbot.openinfosecfoundation.org/builders/inliniac/builds/71
- PR pcaps: https://buildbot.openinfosecfoundation.org/builders/inliniac-pcap/builds/71