Dev oisf 2.1dev smtp v0.4

Address first round of review comments from Victor.

- PR build: https://buildbot.openinfosecfoundation.org/builders/decanio/builds/1
- PR pcaps: https://buildbot.openinfosecfoundation.org/builders/decanio-pcap/builds/1