[BZ 1115422] Change layout of CSV, stop stripping commas and instead quote fields which include delimiter in the data