MAGETWO-75635: Merge 2.2.0-develop into develop

Author: slavvka

dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php

@@ -285,8 +285,8 @@ public function testWithConfirmCreatePostAction()
         $this->assertSessionMessages(
             $this->equalTo([
                 'You must confirm your account. Please check your email for the confirmation link or '
-                    . '<a href="http://localhost/index.php/customer/account/confirmation/email/'
-                    . 'test2%40email.com/">click here</a> for a new link.'
+                    . '<a href="http://localhost/index.php/customer/account/confirmation/'
+                    . '?email=test2%40email.com/">click here</a> for a new link.'
             ]),
             MessageInterface::TYPE_SUCCESS
         );