ENGCOM-644: MAGETWO-59112 Backport 2.1.x #13896

 - Merge Pull Request #13896 from Ctucker9233/magento2:2.1-develop
 - Merged commits:
   1. abd2402
   2. b19a484
   3. 900b46a
   4. 443818b
   5. 19cf917
   6. 2d37305
   7. 0b9e7ea
   8. febee6e
   9. 1cafd7c
   10. 0e97647
   11. c790422
   12. adb3020
   13. fefdabe
   14. 71e9d15
   15. d19a257
   16. 5d07e6e

Author: magento-engcom-team

app/code/Magento/Customer/etc/config.xml

@@ -81,17 +81,15 @@ T: {{var telephone}}
 {{depend vat_id}}<br/>VAT: {{var vat_id}}{{/depend}}]]></html>
                 <pdf><![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}|
 {{depend company}}{{var company}}|{{/depend}}
-{{if street1}}{{var street1}}
-{{/if}}
+{{if street1}}{{var street1}}|{{/if}}
 {{depend street2}}{{var street2}}|{{/depend}}
 {{depend street3}}{{var street3}}|{{/depend}}
 {{depend street4}}{{var street4}}|{{/depend}}
-{{if city}}{{var city}},|{{/if}}
-{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}|
+{{if city}}{{var city}}, {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}|
 {{var country}}|
-{{depend telephone}}T: {{var telephone}}{{/depend}}|
-{{depend fax}}<br/>F: {{var fax}}{{/depend}}|
-{{depend vat_id}}<br/>VAT: {{var vat_id}}{{/depend}}|]]></pdf>
+{{depend telephone}}T: {{var telephone}}|{{/depend}}
+{{depend fax}}F: {{var fax}}|{{/depend}}|
+{{depend vat_id}}VAT: {{var vat_id}}{{/depend}}|]]></pdf>
             </address_templates>
         </customer>
         <general>

dev/tests/integration/testsuite/Magento/Customer/Block/Address/Renderer/DefaultRendererTest.php

@@ -56,7 +56,7 @@ public function renderArrayDataProvider()
             [
                 $addressAttributes,
                 AttributeDataFactory::OUTPUT_FORMAT_PDF,
-                "John Smith|\n\nGreen str, 67\n\n\n\n\nCityM,|\nAlabama, 75477|\nUnited States|\nT: 3468676|\n|\n|"
+                "John Smith|\n\nGreen str, 67|\n\n\n\nCityM, Alabama, 75477|\nUnited States|\nT: 3468676|\n|\n|"
             ],
             [
                 $addressAttributes,
@@ -112,7 +112,7 @@ public function renderDataProvider()
             [
                 $address,
                 AttributeDataFactory::OUTPUT_FORMAT_PDF,
-                "John Smith|\n\nGreen str, 67\n\n\n\n\nCityM,|\nAlabama, 75477|
+                "John Smith|\n\nGreen str, 67|\n\n\n\nCityM, Alabama, 75477|
 United States|\nT: 3468676|\n|\n|"
             ],
             [