Merge remote-tracking branch 'ykhadilkar-rei/Release-1.19' into inventory

Conflicts:
	ckanext/datajson/plugin.py

Author: FuhuXia

ckanext/datajson/plugin.py

@@ -298,7 +298,7 @@ def write_zip(data, error=None, zip_name='data'):
 
     #Write the data file
     if data:
-        zf.writestr('data.json', json.dumps(data).encode('utf8'))
+        zf.writestr('datajson.txt', json.dumps(data, ensure_ascii=False).encode('utf8'))
 
     #Write the error log
     if error: