Merge branch 'master' into druid
Parsed hosts and networks file in order to produce better information to druid
Added src_name, src_str, dst_name and dst_str to json fields, based on
/opt/rb/etc/{hosts,networks} files
	modified:   output-plugins/spo_alert_json.c
Added network identifications in source and destination ip
	modified:   output-plugins/spo_alert_json.c
Added geoIP support using maxmind GeoIP
	modified:   Makefile.am
	modified:   output-plugins/spo_alert_json.c
Fixed a possible memory leak.
	modified:   src/sfutil/sf_kafka.c
Fixed some possible memory leaks and enabled --enable-geo-ip in
configure script
	modified:   configure.in
	modified:   src/output-plugins/spo_alert_json.c
Updated librdkafka
Added to sf_kafka a maximum queue length value
	modified:   sfutil/sf_kafka.c
fix: possible double free's on cleanup when HUP recieved.
Added json_output plugin
Fix: little issue when starting in SIDv2 mode, mainly due to a early
     free of the classification file path name in ReadClassification().
     value is now copied properly and freed at cleanup.

Fix: leak in spo_syslog_full arguments parsing. (unrelated)
Added json and geoIP libs conditional compile stuff in configure.in.
KafkaLog now have a TextLog to print to a file, and alert_json does not
have to worry about send to kafka and to a textfile.
Merge branch 'master' into druid
FIX: sf_kafka did not compile if --enable-kafka were passed to compile
script
Added priority and classification fields to alert_json plugin. Some fields will be always printed, too
Added sensor_id capability
Added sensor_id and sensor_name passed by params. We will send the country code in s_ip and dest_ip too.
Using sf_ip from sfutils module, what simplifies a bit the name resolution
Managed a geoip NULL return when ip is not in the database.
FIXED: Sendig src_country twice by error