Bug 1131031 - improving /etc/group, /etc/shadow recovery