group/passwd: more upstream changes