Fix unicode-related failures in CSV upload.

TNL-586

@adampalay 
you might want to rebase off of origin/release again?