Merge "Add support for 'collectd-master' container"