Merge branch 'collectd-4.9' into collectd-4.10

Conflicts:
	src/collectd.conf.in
	src/python.c

diff --cc README
Simple merge

diff --cc configure.in
Simple merge

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

diff --cc src/collectd.h
Simple merge

diff --cc src/curl_json.c
Simple merge

diff --cc src/netapp.c
Simple merge

diff --cc src/network.c
Simple merge

diff --cc src/python.c
index 8772cd1fc23623d52f8ab8d96042ee86b18bc2bb,16de81d414b1b8ca55867f99fb3b0f77e02e361c..c056b5bf076ebee47b4490ff033a204dbf8f922e
--- 1/src/python.c
--- 2/src/python.c
+++ b/src/python.c
@@@ -962,22 -890,9 +962,23 @@@ static PyObject *cpy_oconfig_to_pyconfi
        return item;
  }
  
 +#ifdef IS_PY3K
 +static struct PyModuleDef collectdmodule = {
 +      PyModuleDef_HEAD_INIT,
 +      "collectd",   /* name of module */
 +      "The python interface to collectd", /* module documentation, may be NULL */
 +      -1,
 +      cpy_methods
 +};
 +
 +PyMODINIT_FUNC PyInit_collectd(void) {
 +      return PyModule_Create(&collectdmodule);
 +}
 +#endif
 +
  static int cpy_config(oconfig_item_t *ci) {
        int i;
+       char *argv = "";
        PyObject *sys, *tb;
        PyObject *sys_path;
        PyObject *module;
@@@ -1017,11 -922,10 +1018,14 @@@
                cpy_log_exception("python initialization");
                return 1;
        }
+       PySys_SetArgv(1, &argv);
+       PyList_SetSlice(sys_path, 0, 1, NULL);
+ 
 +#ifdef IS_PY3K
 +      module = PyImport_ImportModule("collectd");
 +#else
        module = Py_InitModule("collectd", cpy_methods); /* Borrowed reference. */
 +#endif
        PyModule_AddObject(module, "Config", (void *) &ConfigType); /* Steals a reference. */
        PyModule_AddObject(module, "Values", (void *) &ValuesType); /* Steals a reference. */
        PyModule_AddObject(module, "Notification", (void *) &NotificationType); /* Steals a reference. */

diff --cc src/utils_match.c
Simple merge