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

OK, I'll clean up the spool file.  The main reason I removed the -r was because we don't use it in the runtime code.  QE noticed that the regenerated entries we missing a few fields (not really important fields but it could be seen as confusing).

In the future we might want to consider making some minor changes to the runtime so that we could reuse the group/user add logic.