Merge "baro: update collectd-openstack branch" into stable/euphrates