Merge remote-tracking branch 'origin/COOK-2180'

* origin/COOK-2180:
  COOK-2180 Add a new way to manage plugins

Conflicts:
	attributes/default.rb
	metadata.rb