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