MAGETWO-72469: Merge 2.2-develop into develop

Author: slavvka

dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.xml

@@ -11,7 +11,7 @@
             <data name="initialRewrite/dataset" xsi:type="string">default</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">wishlist/%isolation%</data>
-            <data name="urlRewrite/data/target_path/entity" xsi:type="string">https://www.magentocommerce.com/magento-connect/</data>
+            <data name="urlRewrite/data/target_path/entity" xsi:type="string">https://marketplace.magento.com/</data>
             <data name="urlRewrite/data/redirect_type" xsi:type="string">Permanent (301)</data>
             <data name="urlRewrite/data/description" xsi:type="string">test_description_relative path</data>
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteSaveMessage" />