Merge "Add CLI support for collectd plugins"