Eve log updates

https://redmine.openinfosecfoundation.org/issues/1131
https://redmine.openinfosecfoundation.org/issues/1127

Prscript:
- PR build: https://buildbot.suricata-ids.org/builders/inliniac/builds/228
- PR pcaps: https://buildbot.suricata-ids.org/builders/inliniac-pcap/builds/148