Merge branch 'master' into write_graphite_escape_fix

diff --cc src/utils/format_graphite/format_graphite.c
index a20ca30e55e89e8c54b1d2ddd1cabbb2d43fe98c,d0e047ff81aa257daae97ef207c998b4fee808ce..5483c2faaa93417e71445ff4b5fba3dec4401ee0
--- 1/src/utils_format_graphite.c
--- 2/src/utils/format_graphite/format_graphite.c
+++ b/src/utils/format_graphite/format_graphite.c
@@@ -23,13 -23,13 +23,13 @@@
  
  #include "collectd.h"
  
- #include "common.h"
  #include "plugin.h"
+ #include "utils/common/common.h"
  
+ #include "utils/format_graphite/format_graphite.h"
  #include "utils_cache.h"
- #include "utils_format_graphite.h"
  
 -#define GRAPHITE_FORBIDDEN " \t\"\\:!/()\n\r"
 +#define GRAPHITE_FORBIDDEN " \t\"\\:!,/()\n\r"
  
  /* Utils functions to format data sets in graphite format.
   * Largely taken from write_graphite.c as it remains the same formatting */

diff --cc src/utils/format_graphite/format_graphite_test.c
Simple merge