am 8b2cdcd1: Merge change 20037 into donut

Merge commit '8b2cdcd184acfebfb245b15a71f5f1c32e53b050'

* commit '8b2cdcd184acfebfb245b15a71f5f1c32e53b050':
  fix issue with gids not being added for packages with shared user id