Merge "src: ensure hostname is included in collectd conf"