afpacket bug1130 v0

This is https://github.com/inliniac/suricata/pull/898 plus the timeout issue fix.

Tested both on my QA rig and the live traffic box to confirm both issues are fixed.

Prscript:
- PR build: https://buildbot.suricata-ids.org/builders/inliniac/builds/237
- PR pcaps: https://buildbot.suricata-ids.org/builders/inliniac-pcap/builds/157

cc: @Regit