Merge branch '6.4' into 7.1

* 6.4:
  fix merge
  pass CSV escape characters explicitly
  move setting deprecation session options into a legacy group test

Author: xabbuh

Resources/bin/sync-iban-formats.php

@@ -129,7 +129,7 @@ private function readPropertiesFromRegistry(array $properties): array
         array_shift($lines);
 
         foreach ($lines as $line) {
-            $columns = str_getcsv($line, "\t");
+            $columns = str_getcsv($line, "\t", '"', '\\');
             $propertyLabel = array_shift($columns);
 
             if (!isset($properties[$propertyLabel])) {