Merge branch 'collectd-4.5'

diff --cc src/Makefile.am
Simple merge

diff --cc src/collectd.conf.in
Simple merge

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/configfile.c
Simple merge

diff --cc src/perl.c
Simple merge

diff --cc src/processes.c
Simple merge

diff --cc src/rrdtool.c
index 9b236cb85553a5d632d35760bb266c97bfba27ff,e1c7902b1f5e346250f8ea82ae52512421fca173..3265561673fb2263c76965c2bea5f4f7ab0d78d2
--- 1/src/rrdtool.c
--- 2/src/rrdtool.c
+++ b/src/rrdtool.c
@@@ -873,9 -1217,11 +877,11 @@@ static int rrd_config (const char *key
                {
                        fprintf (stderr, "rrdtool: `RRARows' must "
                                        "be greater than 0.\n");
+                       ERROR ("rrdtool: `RRARows' must "
+                                       "be greater than 0.\n");
                        return (1);
                }
 -              rrarows = tmp;
 +              rrdcreate_config.rrarows = tmp;
        }
        else if (strcasecmp ("RRATimespan", key) == 0)
        {
@@@ -922,9 -1269,11 +929,11 @@@
                {
                        fprintf (stderr, "rrdtool: `XFF' must "
                                        "be in the range 0 to 1 (exclusive).");
+                       ERROR ("rrdtool: `XFF' must "
+                                       "be in the range 0 to 1 (exclusive).");
                        return (1);
                }
 -              xff = tmp;
 +              rrdcreate_config.xff = tmp;
        }
        else if (strcasecmp ("WritesPerSecond", key) == 0)
        {