Extract file manipulation out of EditPerson
Merge branch 'master' into jsAddPoolerToPod