Merge collectd-3.10.4-1 into bpo branch.

diff --cc debian/changelog
Simple merge

diff --cc debian/control
index 7eb9032263410c958716fc5b2a227e208b27d189,41eb193d6773d88d116055d604c443ea87e13d13..f46bad271a2e168a2f4dead09f7d4e190e66a0a6
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -2,8 -2,7 +2,8 @@@ Source: collect
  Section: utils
  Priority: optional
  Maintainer: Sebastian Harl <sh@tokkee.org>
- Build-Depends: debhelper (>= 5), autotools-dev, libcurl3-gnutls-dev,
 -Build-Depends: debhelper (>= 5), autotools-dev, libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3)
++Build-Depends: debhelper (>= 5), autotools-dev, libcurl3-dev,
 + libmysqlclient14-dev, librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3)
  Standards-Version: 3.7.2
  
  Package: collectd