Remove "CF." from custom fields used for user searching before display to the user
Ensure that the fields are consistently ordered
Merge branch '4.2/user-search-cf-names'