Fix several minor errors, also some cherry picking from SMF21

Main changes are the removal of the duplicate loadCustomFields function (consolidated in the one in profile) and the cherry pick to make the personal text field a standard profile field.