Merge "baro: update collectd-openstack branch"