Fix logic when datastore changed.

When the datastore changes for MachineCategory, we always have to
remove all accounts from the old datastore and add then to the new
datastore, even if that MachineCategory is always in use. This is
because the accounts are always specific to a given machineCategory.

Change-Id: I7d88749ea7d06978758ed54371c8f6e515835ef7