Merge remote-tracking branch 'origin/mcollective'
Merge remote-tracking branch 'remotes/example42/master'
Added config action to puppi
Merge remote-tracking branch 'remotes/upstream/master'
Merge branch 'configure' of https://github.com/hybris/puppi into hybris-configure