Fix unicode-related failures in CSV upload.

TNL-586

@adampalay 
Looks like it picked up some earlier  changes.