Logic cleanup in csv import and use Drupal's default machine name regex for conditioning registration state name