Do not keep illegitimate custom_values when setting custom_field_values (#7604).
Authored by: jplang 2011-02-20
Parent: [r4890]
Child: [r4892]