Dev json cim v1.1

Here's the JSON related patchset discussed on IRC.
There is two phases:
 - Synchronize key name with different norms
 - Update the events for an easier usage of information in logstash

PR builds:
- PR build: https://buildbot.suricata-ids.org/builders/regit/builds/97
- PR pcaps: https://buildbot.suricata-ids.org/builders/regit-pcap/builds/36