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

QE suggested restoring the file to the exact state as before so that a diff would return nothing.  Sort of a nice to have but could turn out odd to maintain.