Dev app tx cleanup v1.6

Rebase of https://github.com/inliniac/suricata/pull/721

Prscript:
https://buildbot.suricata-ids.org/builders/inliniac/builds/120
https://buildbot.suricata-ids.org/builders/inliniac-pcap/builds/41 (1 fail expected)