Merge "Fix collectd decoder for Xenial compute nodes"