Merge branch 'master' into pri

diff --cc src/amqp.c
Simple merge

diff --cc src/barometer.c
Simple merge

diff --cc src/ceph.c
Simple merge

diff --cc src/csv.c
Simple merge

diff --cc src/daemon/common.c
Simple merge

diff --cc src/daemon/plugin.c
Simple merge

diff --cc src/daemon/types_list.c
Simple merge

diff --cc src/dpdkstat.c
Simple merge

diff --cc src/email.c
Simple merge

diff --cc src/gmond.c
Simple merge

diff --cc src/libcollectdclient/network_parse.c
Simple merge

diff --cc src/libcollectdclient/network_parse_test.c
Simple merge

diff --cc src/modbus.c
Simple merge

diff --cc src/netlink.c
Simple merge

diff --cc src/network.c
Simple merge

diff --cc src/ntpd.c
Simple merge

diff --cc src/perl.c
Simple merge

diff --cc src/ping.c
Simple merge

diff --cc src/powerdns.c
Simple merge

diff --cc src/processes.c
Simple merge

diff --cc src/rrdcached.c
Simple merge

diff --cc src/rrdtool.c
Simple merge

diff --cc src/snmp.c
Simple merge

diff --cc src/snmp_agent.c
Simple merge

diff --cc src/table.c
Simple merge

diff --cc src/utils_cmd_getthreshold.c
Simple merge

diff --cc src/utils_cmd_getval.c
Simple merge

diff --cc src/utils_format_json.c
Simple merge

diff --cc src/utils_ovs.c
Simple merge

diff --cc src/virt.c
Simple merge

diff --cc src/write_graphite.c
Simple merge

diff --cc src/write_riemann.c
Simple merge

diff --cc src/write_sensu.c
Simple merge

diff --cc src/write_tsdb.c
Simple merge