[puppet: 6/9] Merge branch 'master' of ssh://git.rpmfusion.org/git/infrastructure/puppet