Automatic commit of package [pulp-puppet] release [2.4.1-0.4.beta].
Merge branch '2.4.1-dev' into 2.4-dev

Conflicts:
	pulp-puppet.spec
	rel-eng/packages/pulp-puppet
Merge branch '2.4-dev'