REW-2045 - return str and not nil if string is UTF8 already ( was causing spec failures)

Author: reissjohnson

app/models/concerns/csv2db/import.rb

@@ -194,9 +194,9 @@ def set_default_values
     end
 
     def str_to_utf8(str)
-      return if str_encoding(str) == 'UTF-8'
+      return str if str_encoding(str) == 'UTF-8'
 
-      CharlockHolmes::Converter.convert(str, str.detect_encoding[:encoding], 'UTF-8')
+      CharlockHolmes::Converter.convert(str, str_encoding(str), 'UTF-8')
     end
 
     def str_encoding(str)