Merge branch 'collectd-5.5'

diff --cc contrib/redhat/collectd.spec
index 53ceb934c70a21b2592bdeb1d617481ff56f0e3c,fb0a55cd4da9fe871ada0132f0d518dc154d910f..8d8cb8d9b187c2c8775598f14579a523bcc60244
--- 1/contrib/redhat/collectd.spec
--- 2/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -67,7 -66,8 +66,9 @@@
  %{?el7:%global _has_atasmart 1}
  %{?el7:%global _has_hiredis 1}
  %{?el7:%global _has_asm_msr_index 1}
 +%{?el7:%global _has_libmosquitto 1}
+ %{?el7:%global _has_libmodbus 1}
+ %{?el7:%global _has_xmms 1}
  
  # plugins enabled by default
  %define with_aggregation 0%{!?_without_aggregation:1}
@@@ -214,10 -213,6 +216,8 @@@
  %define with_write_kafka 0%{!?_without_write_kafka:0}
  # plugin write_mongodb disabled, requires libmongoc
  %define with_write_mongodb 0%{!?_without_write_mongodb:0}
- # plugin xmms disabled, requires xmms
- %define with_xmms 0%{!?_without_xmms:0}
 +# plugin zone disabled, requires Solaris
 +%define with_zone 0%{!?_without_zone:0}
  
  Summary:      statistics collection and monitoring daemon
  Name:         collectd