Fix for MODULES-1250.  Splitting commit for PR #173 which superseded PR #98, #97, & #87.
Fix for MODULES-1250.  Splitting commit for PR #173 which superseded PR #98, #97, & #87.

puppet-community/puppet-mcollective,saimonn/puppet-mcollective,saimonn/puppet-mcollective,puppet-community/puppet-mcollective,legooolas/puppet-mcollective,buzzdeee/puppet-mcollective,fuel-infra/puppet-mcollective,mvisonneau/puppet-mcollective,buzzdeee/puppet-mcollective,voxpupuli/puppet-mcollective,fuel-infra/puppet-mcollective,mvisonneau/puppet-mcollective,legooolas/puppet-mcollective,voxpupuli/puppet-mcollective