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

We needed to separate the group add from the user add in case the where only the group was missing.