Merge "fix shared gid support in getpwnam/getgrnam"