Merge "Fix configuration of collectd (lib)virt plugin"