Merge magento#11058 commit 'refs/pull/11058/head' of https://github.com/magento/magento2 into MAGETWO-80081-PR-11058

# Conflicts:
#	app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui.js
#	dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/_files/controller_acl_test_whitelist_ce.txt

Author: vrann

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')]));
             }
         }