EB-7878: code clean up
EB-8080: Fixed data format issue on csv file.
Primary key name  exceed 18 characters issue fix