1168602 - fix missing /usr/share/pulp-rpm/pulp_distribution.xsd in the spec file
Merge branch '2.5-testing' into 2.6-dev
1165355 - Sanitize checksum types.

SHA and SHA-1 are the same checksum algorithm, but Pulp considered them
to be separate algorithms. This commit ensures that Pulp no longer
stores the SHA-1 algorithm as "sha" in the database, and it also
contains a migration that resolves existing "sha" objects.

https://bugzilla.redhat.com/show_bug.cgi?id=1165355
Merge branch '2.4-dev' into 2.5-testing

Conflicts:
	plugins/pulp_rpm/plugins/importers/yum/parse/treeinfo.py
	plugins/pulp_rpm/plugins/importers/yum/upload.py
	plugins/test/unit/plugins/importers/yum/parse/test_treeinfo.py
	plugins/test/unit/plugins/importers/yum/repomd/test_metadata.py
	plugins/test/unit/plugins/importers/yum/repomd/test_primary.py
Merge branch '2.5-testing' into 2.6-dev
Automatic commit of package [pulp-rpm] release [2.4.4-0.1.beta].
Merge branch '2.4-dev' into 2.5-testing

Conflicts:
	pulp-rpm.spec
	rel-eng/packages/pulp-rpm
Merge branch '2.5-testing' into 2.6-dev

Conflicts:
	pulp-rpm.spec
Automatic commit of package [pulp-rpm] release [2.5.1-0.1.beta].
Merge remote-tracking branch 'origin/2.5-testing' into 2.6-dev

Conflicts:
	pulp-rpm.spec
	rel-eng/packages/pulp-rpm
Fix some failing unit tests.
11157852 - Convert timestamp values in the repomd to integers from floats
Merge branch '2.5-testing' into 2.6-dev
Merge branch '2.4-dev' into 2.5-testing
Merge branch '2.5-testing' into 2.6-dev
972880 - The ISO importer now checks all ISO units before downloading
new content.

Before, it only checked the repository it was importing to, causing it
to redownload units that already existed in Pulp.
Merge pull request #601 from jeremycline/972880

972880 - The ISO importer now checks all ISO units before downloading