master: 0799d95d0b79684447bbc6a0c87ce8f00e34e933 Update passwd and group files by merging them non-destructively.