If during the course of an upgrade, the upgrader receives an 'entry already exists' response from the server following an attempt to add an entry to the configuration, the server entry and the to-add entry are compared.  If their user attributes are identical then the error is ignored and the upgrade proceeds.  If not then an error is shown to the user as before.