MAGETWO-59112: [GITHUB] Invoice Address Formatting Issue #6771

- Fixing test

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

@@ -86,8 +86,7 @@ T: {{var telephone}}
 {{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}}F: {{var fax}}|{{/depend}}|

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

@@ -56,7 +56,7 @@ class DefaultRendererTest extends \PHPUnit_Framework_TestCase
             [
                 $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 @@ United States<br/>\nT: <a href=\"tel:3468676\">3468676</a>\n\n",
             [
                 $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|"
             ],
             [