MAGETWO-39264: [Improvement]"See our shipping policy" supports only "one...

MAGETWO-39264: [Improvement]"See our shipping policy" supports only "one string text" there is no ability to split text to multi line

app/code/Magento/Checkout/Model/DefaultConfigProvider.php

@@ -295,9 +295,11 @@ class DefaultConfigProvider implements ConfigProviderInterface
                     'shipping/shipping_policy/enable_shipping_policy',
                     ScopeInterface::SCOPE_STORE
                 ),
-                'shippingPolicyContent' => $this->scopeConfig->getValue(
-                    'shipping/shipping_policy/shipping_policy_content',
-                    ScopeInterface::SCOPE_STORE
+                'shippingPolicyContent' => nl2br(
+                    $this->scopeConfig->getValue(
+                        'shipping/shipping_policy/shipping_policy_content',
+                        ScopeInterface::SCOPE_STORE
+                    )
                 )
             ],
             'activeCarriers' => $this->getActiveCarriers(),

app/code/Magento/Shipping/view/frontend/web/template/checkout/shipping/shipping-policy.html

@@ -9,6 +9,6 @@
         <!-- ko text: $t('See our shipping policy') --><!-- /ko -->
     </span>
     <div class="field-tooltip-content">
-        <!-- ko text: config.shippingPolicyContent --><!-- /ko -->
+        <span data-bind="html: config.shippingPolicyContent"></span>
     </div>
 </div>