Next v2

PRs: #1182 #1175 #1181 #1177 #1178 

Prscript:
- PR build: https://buildbot.openinfosecfoundation.org/builders/inliniac/builds/42
- PR pcaps: https://buildbot.openinfosecfoundation.org/builders/inliniac-pcap/builds/42