Merge branch 'collectd-4.1' into collectd-4.2

diff --cc src/rrdtool.c
Simple merge

diff --cc src/utils_avltree.c
index 11d3d716c92bd259d712a5920ced0ffa1cd79c62,e46095933ddc0ddddc933931056c557f7ad4f079..83821fe99c37671ad36ece3ab3d14ddcba84f1d1
--- 1/src/utils_avltree.c
--- 2/src/utils_avltree.c
+++ b/src/utils_avltree.c
@@@ -575,12 -575,14 +575,12 @@@ int c_avl_remove (c_avl_tree_t *t, cons
        status = _remove (t, n);
        verify_tree (t->root);
        return (status);
- } /* void *avl_remove */
+ } /* void *c_avl_remove */
  
- int avl_get (avl_tree_t *t, const void *key, void **value)
+ int c_avl_get (c_avl_tree_t *t, const void *key, void **value)
  {
-       avl_node_t *n;
+       c_avl_node_t *n;
  
 -      assert (value != NULL);
 -
        n = search (t, key);
        if (n == NULL)
                return (-1);