Merge branch 'mf/redhat' into collectd-5.2