924327 - Make sure to run the groups/categories upgrades in the
aggregate
Merge pull request #398 from pulp/jdob-924327

924327 - Make sure to run the groups/categories upgrades in the
Merge branch 'pulp-2.1'