Merge forwardport of #11058 to 2.3-develop branch

Applied pull request patch https://github.com/magento/magento2/pull/11058.patch (created by @Quinten) based on commit(s):
  1. c3ea1f5
  2. 0c0393d
  3. d93173d

Author: magento-engcom-team

app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/AddressTest.php

@@ -47,7 +47,7 @@ public function testPrepareDataSource()
     {
         $itemName = 'itemName';
         $oldItemValue = "itemValue\n";
-        $newItemValue = 'itemValue<br/>';
+        $newItemValue = "itemValue<br />\n";
         $dataSource = [
             'data' => [
                 'items' => [
@@ -57,7 +57,7 @@ public function testPrepareDataSource()
         ];
 
         $this->model->setData('name', $itemName);
-        $this->escaper->expects($this->once())->method('escapeHtml')->with($newItemValue)->willReturnArgument(0);
+        $this->escaper->expects($this->any())->method('escapeHtml')->with($oldItemValue)->willReturnArgument(0);
         $dataSource = $this->model->prepareDataSource($dataSource);
         $this->assertEquals($newItemValue, $dataSource['data']['items'][0][$itemName]);
     }

app/code/Magento/Sales/Ui/Component/Listing/Column/Address.php

@@ -49,9 +49,7 @@ public function prepareDataSource(array $dataSource)
     {
         if (isset($dataSource['data']['items'])) {
             foreach ($dataSource['data']['items'] as & $item) {
-                $item[$this->getData('name')] = $this->escaper->escapeHtml(
-                    str_replace("\n", '<br/>', $item[$this->getData('name')])
-                );
+                $item[$this->getData('name')] = nl2br($this->escaper->escapeHtml($item[$this->getData('name')]));
             }
         }