smtp v17.6

Rebase and a small fix

Prscript:
- PR build: https://buildbot.openinfosecfoundation.org/builders/inliniac/builds/52
- PR pcaps: https://buildbot.openinfosecfoundation.org/builders/inliniac-pcap/builds/52