Bug 21881 - Update archive table for old user renames

Change-Id: I9a17271078413b9a667a7b9eb1b0d8e036c74f76