924327 - Make sure to run the groups/categories upgrades in the

aggregate