1033776 - If scratchpad contains fields other than checksum_type then checksum may be calculated incorrectly.
Automatic commit of package [pulp-rpm] release [2.3.1-0.1.beta].
Merge pull request #396 from pulp/barnabycourt-1033776

1033776 - If scratchpad contains fields other than checksum_type then ch...
Automatic commit of package [pulp-rpm] release [2.3.1-0.2.beta].
Merge branch 'pulp-2.3.1'

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