Fix the upgrade migration of custom profile fields

The upgrade_2-1_postgresql.sql changes are untested, but do match the changes to upgrade_2-1_mysql.sql that are tested and confirmed.

Signed-off-by: Noteworthy Software, Inc <online@noteworthysoftware.com>
Modify genderTypes array to meet requested coding style

Signed-off-by: Noteworthy Software, Inc <online@noteworthysoftware.com>
Merge pull request #2546 from nwsw/upgradefix

Fix the upgrade migration of custom profile fields in #2545