Merge pull request #321 from pulp/mhrivnak-1004049

1004049 - added a migration for errata that have the old "from_str" key
Merge pull request #322 from pulp/rbarlow-1004086

1004086 - Rename migration #11 to #7, and increment migration version #7...
Automatic commit of package [pulp-rpm] release [2.2.0-0.30.beta].
fixing the collection name in a migration.
Merge pull request #325 from pulp/mhrivnak-collection-name

Mhrivnak collection name
Automatic commit of package [pulp-rpm] release [2.2.0-0.32.beta].
Merge commit '87d8b1741a2d7a95b41261060201550841c18057'
Merge commit before build 2.2.0-0.30.beta
Merge commit 'e90bd3e6534daee9bf067c2ef5792aa565d55aa4'
Automatic commit of package [pulp-rpm] release [2.2.0-0.30.beta]
Merge commit '31732c976b1d8f72ddceb98ce6c2f804486f9869'
Merge before build 2.2.0-0.32.beta]
Merge commit '4f51e575303bdbf02ee84fa28f690a039a7d6ba1'
Merge for build 2.2.0-0.32.beta