986026 - Added a migration to upgrade conditional_package_names from v1 to v2.
988005 - uploads of units that are not RPMs work again
Fix some formatting in migration #12.
Merge branch 'rbarlow-986026' into pulp-2.2
changes made while fixing 976561 in the pulp repo
Merge pull request #285 from pulp/jconnor-976561-changes

changes made while fixing 976561 in the pulp repo
Merge pull request #284 from pulp/mhrivnak-988005

988005 - uploads of units that are not RPMs work again
988919 - non-standard repo metadata files that happen to be sqlite files can now be downloaded successfully during a sync
Merge branch 'pulp-2.2' into pulp-2.2.1
Merge branch 'mhrivnak-988919' into pulp-2.2.1
improving a test based on review
Merge branch 'mhrivnak-988919' into pulp-2.2.1
Reverted file descriptor handling and added unit key to rpm metadata
Merge branch 'pulp-2.2.1' into jcline-rpm-iso-export