Multiple tickets

1260: https://github.com/inliniac/suricata/pull/1141
1257 & 1287: https://github.com/inliniac/suricata/pull/1142

Prscript:
- PR build: https://buildbot.openinfosecfoundation.org/builders/inliniac/builds/30
- PR pcaps: https://buildbot.openinfosecfoundation.org/builders/inliniac-pcap/builds/30