Modularize and fix migrate-upload-data

-Modularize import for person into import_person
-Fix bug with now that results in infinite loop
-Fix bug with original_person=authoritative, now original_person=person