Merge "makefile: update collectd Makefile with intel_pmu configuration"