Mcollective integration
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/helpers/nodes_helper.rb