Merge "Import: Properly handle deleted usernames in XML dumps"