maint: fix failing plugin application test
Merge branch 'master' of git://github.com/puppetlabs/marionette-collective

Conflicts:
	spec/unit/plugins/mcollective/application/plugin_spec.rb