Merge change 20037 into donut

* changes:
  fix issue with gids not being added for packages with shared user id