Some Code review updates
Merge pull request #1947 from kaltura/Jupiter-10.0.0-export-csv

Some Code review updates