Automatic commit of package [pulp-puppet] release [2.4.0-0.21.beta].
Merge branch 'pulp-2.4'

Conflicts:
	pulp-puppet.spec
	rel-eng/packages/pulp-puppet