Change how validation works for non-required fields

Previously for countries where we had a list of possible country area values the validator would mark an empty field as invalid even if it was not required. This version only checks field values against a list of valid choices if the values are non-empty.