Start of changes to support the new way of working with multiple user addresses and phone numbers.  Needed because of requirements for Grants.gov submissions.