Fix CSV template files for importing content.
fix merge conflicts
Merge pull request #6175 from openscholar/6078-1

Fix CSV template files for importing content.