Trim off whitespace when saving custom fields

The code in classes/fields/pick.php already does this trim when the choices are displayed

Fixes #2343